Merge remote-tracking branch 'kconfig/for-next'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1baea8d96ff3bee3e80ab9ff2c3a132f00921ee0..7a283f8e3f6750c9e1093201b33624dfe295cea0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5288,6 +5288,12 @@ F:       fs/qnx4/
 F:     include/linux/qnx4_fs.h
 F:     include/linux/qnxtypes.h
 
+QUALCOMM HEXAGON ARCHITECTURE
+M:     Richard Kuo <rkuo@codeaurora.org>
+L:     linux-hexagon@vger.kernel.org
+S:     Supported
+F:     arch/hexagon/
+
 RADOS BLOCK DEVICE (RBD)
 F:     include/linux/qnxtypes.h
 M:     Yehuda Sadeh <yehuda@hq.newdream.net>
@@ -7143,6 +7149,12 @@ L:       linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/wd7000.c
 
+WIIMOTE HID DRIVER
+M:     David Herrmann <dh.herrmann@googlemail.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-wiimote*
+
 WINBOND CIR DRIVER
 M:     David Härdeman <david@hardeman.nu>
 S:     Maintained
@@ -7209,6 +7221,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
@@ -7218,6 +7233,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*