diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-20 09:14:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-20 09:14:04 +0200 |
| commit | 290b421f699463478d215c17cd6be52d78e16976 (patch) | |
| tree | 27a2a4555feed1adc9b0ada4e746b13298f3ce67 /MAINTAINERS | |
| parent | 356aab7d419822f413af5fe1bc47af40957a23fb (diff) | |
| parent | 46724c2e023cb7ba5cd5000dee6481f0a15ebed9 (diff) | |
| download | lwn-290b421f699463478d215c17cd6be52d78e16976.tar.gz lwn-290b421f699463478d215c17cd6be52d78e16976.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 46e3e6b99220..0b4ccdd35bbb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5532,6 +5532,7 @@ F: include/media/*7146* SAMSUNG AUDIO (ASoC) DRIVERS M: Jassi Brar <jassisinghbrar@gmail.com> +M: Sangbeom Kim <sbkim73@samsung.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/samsung @@ -7199,6 +7200,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices S: Supported F: Documentation/hwmon/wm83?? F: drivers/leds/leds-wm83*.c +F: drivers/input/misc/wm831x-on.c +F: drivers/input/touchscreen/wm831x-ts.c +F: drivers/input/touchscreen/wm97*.c F: drivers/mfd/wm8*.c F: drivers/power/wm83*.c F: drivers/rtc/rtc-wm83*.c @@ -7208,6 +7212,7 @@ F: drivers/watchdog/wm83*_wdt.c F: include/linux/mfd/wm831x/ F: include/linux/mfd/wm8350/ F: include/linux/mfd/wm8400* +F: include/linux/wm97xx.h F: include/sound/wm????.h F: sound/soc/codecs/wm* |