aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2004-08-25 18:05:08 +0200
committerVojtech Pavlik <vojtech@suse.cz>2004-08-25 18:05:08 +0200
commit0731e1c0def1b86c70b5f8a83948f8095c7d36bb (patch)
treee69f5bcba1a847e9634da8f715b7032dd925bd0a /MAINTAINERS
parent8b6c83d30c0b39233182521248e755cdf898c156 (diff)
parentf78ed24bab6eab4e1ebdf3400bd0bc1d729013e9 (diff)
downloadhistory-0731e1c0def1b86c70b5f8a83948f8095c7d36bb.tar.gz
Manual merge.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS17
1 files changed, 8 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 782e53d038dceb..7d2cae453bfd01 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1063,6 +1063,13 @@ M: lethal@chaoticdreams.org
L: linux-fbdev-devel@lists.sourceforge.net
S: Maintained
+INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
+P: Vojtech Pavlik
+M: vojtech@suse.cz
+L: linux-input@atrey.karlin.mff.cuni.cz
+L: linux-joystick@atrey.karlin.mff.cuni.cz
+S: Maintained
+
INTEL 810/815 FRAMEBUFFER DRIVER
P: Antonino Daplas
M: adaplas@pol.net
@@ -1187,13 +1194,6 @@ L: jfs-discussion@oss.software.ibm.com
W: http://oss.software.ibm.com/jfs/
S: Supported
-JOYSTICK DRIVER
-P: Vojtech Pavlik
-M: vojtech@suse.cz
-L: linux-joystick@atrey.karlin.mff.cuni.cz
-W: http://www.suse.cz/development/joystick/
-S: Maintained
-
KCONFIG
P: Roman Zippel
M: zippel@linux-m68k.org
@@ -2176,12 +2176,11 @@ M: dbrownell@users.sourceforge.net
L: linux-usb-devel@lists.sourceforge.net
S: Maintained
-USB HID/HIDBP/INPUT DRIVERS
+USB HID/HIDBP DRIVERS
P: Vojtech Pavlik
M: vojtech@suse.cz
L: linux-usb-users@lists.sourceforge.net
L: linux-usb-devel@lists.sourceforge.net
-W: http://www.suse.cz/development/input/
S: Maintained
USB HUB DRIVER