diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
commit | 4038a12e7443b5fed3e526c475c38c115d9600f6 (patch) | |
tree | b39b8fc13c0761459c6bafa1642c6869c4e5747d /MAINTAINERS | |
parent | 2e1210bc3d065a6e26ff5fef228a9a7e08921d2c (diff) | |
parent | 5013951be88e136d9990ef55303276e2779ce8d8 (diff) |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4f555d8e5346..0b4ccdd35bbb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7200,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 @@ -7209,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* |