Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c0cc52a9afe5c4a1342af84e095663b27bc42297..2edec00c12c0cc6fcf3a221f0810825a8eeb04ff 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2558,12 +2558,10 @@ W:      http://www.tazenda.demon.co.uk/phil/linux-hp
 S:     Maintained
 
 MAC80211
-P:     Michael Wu
-M:     flamingice@sourmilk.net
 P:     Johannes Berg
 M:     johannes@sipsolutions.net
-P:     Jiri Benc
-M:     jbenc@suse.cz
+P:     Michael Wu
+M:     flamingice@sourmilk.net
 L:     linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -4358,6 +4356,16 @@ L:       linux-wireless@vger.kernel.org
 W:     http://oops.ghostprotocols.net:81/blog
 S:     Maintained
 
+WM97XX TOUCHSCREEN DRIVERS
+P:     Mark Brown
+M:     broonie@opensource.wolfsonmicro.com
+P:     Liam Girdwood
+M:     liam.girdwood@wolfsonmicro.com
+L:     linux-input@vger.kernel.org
+T:     git git://opensource.wolfsonmicro.com/linux-2.6-touch
+W:     http://opensource.wolfsonmicro.com/node/7
+S:     Supported
+
 X.25 NETWORK LAYER
 P:     Henner Eisen
 M:     eis@baty.hanse.de