8139cp: implement the missing dev->tx_timeout

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2c1dfb271613cdcc01f1178650629ccac5a76bfc..151f4ef978a4aa5ae82c976e76c8716cafa9f4fb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1856,7 +1856,7 @@ W:        http://www.openib.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:     Supported
 
-INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
+INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 P:     Dmitry Torokhov
 M:     dmitry.torokhov@gmail.com
 M:     dtor@mail.ru
@@ -2930,6 +2930,13 @@ M:       mikpe@it.uu.se
 L:     linux-ide@vger.kernel.org
 S:     Maintained
 
+PS3 NETWORK SUPPORT
+P:     Masakazu Mokuno
+M:     mokuno@sm.sony.co.jp
+L:     netdev@vger.kernel.org
+L:     cbe-oss-dev@ozlabs.org
+S:     Supported
+
 PS3 PLATFORM SUPPORT
 P:     Geoff Levand
 M:     geoffrey.levand@am.sony.com