diff options
author | Greg Kroah-Hartman <greg@kroah.com> | 2004-09-12 20:02:40 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-09-12 20:02:40 -0700 |
commit | 2a69c9cd33412d9a7f393dcd9382ab9ed034d3fa (patch) | |
tree | 26e60a470b9eb566c327aa64a4d7453423549a23 /MAINTAINERS | |
parent | 8a690d16e64e76f884d74128dc10ac6b28c135d2 (diff) | |
parent | 26d61c640c05c6cf04987437fad260908faaddf7 (diff) | |
download | history-2a69c9cd33412d9a7f393dcd9382ab9ed034d3fa.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-- | MAINTAINERS | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c1a5296a74c701..bc43c45c6a7c7b 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 @@ -2192,8 +2192,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 @@ -2237,7 +2237,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 @@ -2354,7 +2354,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 |