aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2004-09-29 20:00:42 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2004-09-29 20:00:42 -0700
commitb7db7c7b8226cb7af00f674fd98235ef20b11224 (patch)
treec396bfee96f604f761fb776d276c28475f3a43cf /MAINTAINERS
parentbc633e90bf3ef39b798e2cc417a890a9f72e95cd (diff)
parentcf44e793f222c3ff75f8608e5337dca96b910f1a (diff)
downloadhistory-b7db7c7b8226cb7af00f674fd98235ef20b11224.tar.gz
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index eb7813b15a6400..38f6114f505a36 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -947,7 +947,7 @@ S: Maintained
HPUSBSCSI
P: Oliver Neukum
-M: drivers@neukum.org
+M: oliver@neukum.name
S: Maintained
I2C AND SENSORS DRIVERS
@@ -1428,7 +1428,7 @@ S: Maintained
MICROTEK X6 SCANNER
P: Oliver Neukum
-M: drivers@neukum.org
+M: oliver@neukum.name
S: Maintained
MIPS
@@ -2197,8 +2197,8 @@ W: http://www.kernel.dk
S: Maintained
USB ACM DRIVER
-P: Vojtech Pavlik
-M: vojtech@suse.cz
+P: Oliver Neukum
+M: oliver@neukum.name
L: linux-usb-users@lists.sourceforge.net
L: linux-usb-devel@lists.sourceforge.net
S: Maintained
@@ -2241,7 +2241,7 @@ S: Maintained
USB KAWASAKI LSI DRIVER
P: Oliver Neukum
-M: drivers@neukum.org
+M: oliver@neukum.name
L: linux-usb-users@lists.sourceforge.net
L: linux-usb-devel@lists.sourceforge.net
S: Maintained
@@ -2358,7 +2358,7 @@ L: linux-usb-devel@lists.sourceforge.net
W: http://www.connecttech.com
S: Supported
-USB SN9C10[12] DRIVER
+USB SN9C10x DRIVER
P: Luca Risolia
M: luca.risolia@studio.unibo.it
L: linux-usb-devel@lists.sourceforge.net