aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-24 23:37:52 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-04-24 23:37:52 -0400
commit308f0a5898033691d050374a949bbfe173987a16 (patch)
tree9a7f2798e2f778d6ec126c2f9a1e2c0ba007c742 /MAINTAINERS
parent0035a1dc8f56f2c92f4246b0c8b5f6d1ee10c76b (diff)
parentb345dc7da026016b65162b1ca7cfcd2c7212a285 (diff)
Merge branch 'master' into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 90dcbbcad91..87bdced169a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4343,6 +4343,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