1 files changed, 148 insertions, 98 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b3e92fbe336c..8bf72d378332 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -271,20 +271,20 @@ W:	http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI WMI DRIVER
-P:      Carlos Corbacho
-M:      carlos@strangeworlds.co.uk
-L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
-S:      Maintained
+P:      Carlos Corbacho
+M:      carlos@strangeworlds.co.uk
+L:      linux-acpi@vger.kernel.org
+W:      http://www.lesswatts.org/projects/acpi/
+S:      Maintained
 
 AD1889 ALSA SOUND DRIVER
-P:     Kyle McMartin
-M:     kyle@mcmartin.ca
-P:     Thibaut Varene
-M:     T-Bone@parisc-linux.org
-W:     http://wiki.parisc-linux.org/AD1889
-L:     linux-parisc@vger.kernel.org
-S:     Maintained
+P:      Kyle McMartin
+M:      kyle@mcmartin.ca
+P:      Thibaut Varene
+M:      T-Bone@parisc-linux.org
+W:      http://wiki.parisc-linux.org/AD1889
+L:      linux-parisc@vger.kernel.org
+S:      Maintained
 
 ADM1025 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
@@ -387,8 +387,14 @@ AMD IOMMU (AMD-VI)
 P:      Joerg Roedel
 M:      joerg.roedel@amd.com
 L:      iommu@lists.linux-foundation.org
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 S:      Supported
 
+AMD MICROCODE UPDATE SUPPORT
+P:      Peter Oruba
+M:      peter.oruba@amd.com
+S:      Supported
+
 AMS (Apple Motion Sensor) DRIVER
 P:      Stelian Pop
 M:      stelian@popies.net
@@ -466,6 +472,12 @@ M:	kernel@wantstofly.org
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
+ARM/AFEB9260 MACHINE SUPPORT
+P:      Sergey Lapin
+M:      slapin@ossfans.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/AJECO 1ARM MACHINE SUPPORT
 P:      Lennert Buytenhek
 M:      kernel@wantstofly.org
@@ -473,11 +485,11 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
 ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
-P:      Andrew Victor
-M:      linux@maxim.org.za
-L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-W:      http://maxim.org.za/at91_26.html
-S:      Maintained
+P:      Andrew Victor
+M:      linux@maxim.org.za
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:      http://maxim.org.za/at91_26.html
+S:      Maintained
 
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 P:      Lennert Buytenhek
@@ -491,7 +503,7 @@ M:	kernel@wantstofly.org
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
-ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
 P:      Mike Rapoport
 M:      mike@compulab.co.il
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@ -532,10 +544,10 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
 ARM/HP JORNADA 7XX MACHINE SUPPORT
-P:      Kristoffer Ericson
-M:      kristoffer.ericson@gmail.com
-W:      www.jlime.com
-S:      Maintained
+P:      Kristoffer Ericson
+M:      kristoffer.ericson@gmail.com
+W:      www.jlime.com
+S:      Maintained
 
 ARM/INTEL IOP32X ARM ARCHITECTURE
 P:      Lennert Buytenhek
@@ -623,6 +635,12 @@ M:	marek.vasut@gmail.com
 W:      http://hackndev.com
 S:      Maintained
 
+ARM/PALMZ72 SUPPORT
+P:     Sergey Lapin
+M:     slapin@ossfans.org
+W:     http://hackndev.com
+S:     Maintained
+
 ARM/PLEB SUPPORT
 P:      Peter Chubb
 M:      pleb@gelato.unsw.edu.au
@@ -750,11 +768,13 @@ P:	Ville Syrjala
 M:      syrjala@sci.fi
 S:      Maintained
 
-ATL1 ETHERNET DRIVER
+ATLX ETHERNET DRIVERS
 P:      Jay Cliburn
 M:      jcliburn@gmail.com
 P:      Chris Snook
 M:      csnook@redhat.com
+P:      Jie Yang
+M:      jie.yang@atheros.com
 L:      atl1-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/atl1
 W:      http://atl1.sourceforge.net
@@ -1015,7 +1035,7 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
-P:      Jonathan Corbet
+P:      Jonathan Corbet
 M:      corbet@lwn.net
 L:      video4linux-list@redhat.com
 S:      Maintained
@@ -1046,6 +1066,13 @@ L:	cbe-oss-dev@ozlabs.org
 W:      http://www.ibm.com/developerworks/power/cell/
 S:      Supported
 
+CISCO 10G ETHERNET DRIVER
+P:      Scott Feldman
+M:      scofeldm@cisco.com
+P:      Joe Eykholt
+M:      jeykholt@cisco.com
+S:      Supported
+
 CFAG12864B LCD DRIVER
 P:      Miguel Ojeda Sandonis
 M:      miguel.ojeda.sandonis@gmail.com
@@ -1196,9 +1223,7 @@ M:	hpa@zytor.com
 S:      Maintained
 
 CPUSETS
-P:      Paul Jackson
 P:      Paul Menage
-M:      pj@sgi.com
 M:      menage@google.com
 L:      linux-kernel@vger.kernel.org
 W:      http://www.bullopensource.org/cpuset/
@@ -1357,7 +1382,7 @@ P:	Digi International, Inc
 M:      Eng.Linux@digi.com
 L:      Eng.Linux@digi.com
 W:      http://www.digi.com
-S:      Orphaned
+S:      Orphan
 
 DIRECTORY NOTIFICATION
 P:      Stephen Rothwell
@@ -1421,12 +1446,12 @@ L:	linux-acpi@vger.kernel.org
 S:      Supported
 
 DOCUMENTATION (/Documentation directory)
-P:     Michael Kerrisk
-M:     mtk.manpages@gmail.com
-P:     Randy Dunlap
-M:     rdunlap@xenotime.net
-L:     linux-doc@vger.kernel.org
-S:     Maintained
+P:      Michael Kerrisk
+M:      mtk.manpages@gmail.com
+P:      Randy Dunlap
+M:      rdunlap@xenotime.net
+L:      linux-doc@vger.kernel.org
+S:      Maintained
 
 DOUBLETALK DRIVER
 P:      James R. Van Zandt
@@ -1457,7 +1482,7 @@ S:	Maintained
 DVB SUBSYSTEM AND DRIVERS
 P:      LinuxTV.org Project
 M:      v4l-dvb-maintainer@linuxtv.org
-L:      linux-dvb@linuxtv.org (subscription required)
+L:      linux-dvb@linuxtv.org (subscription required)
 W:      http://linuxtv.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
@@ -1639,9 +1664,10 @@ L:	linux-ext4@vger.kernel.org
 S:      Maintained
 
 EXT4 FILE SYSTEM
-P:      Stephen Tweedie, Andrew Morton
-M:      sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
+P:      Theodore Ts'o
+M:      tytso@mit.edu, adilger@sun.com
 L:      linux-ext4@vger.kernel.org
+W:      http://ext4.wiki.kernel.org
 S:      Maintained
 
 F71805F HARDWARE MONITORING DRIVER
@@ -1795,7 +1821,7 @@ FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 P:      Rik Faith
 M:      faith@cs.unc.edu
 L:      linux-scsi@vger.kernel.org
-S:      Odd fixes (e.g., new signatures)
+S:      Odd Fixes (e.g., new signatures)
 
 GDT SCSI DISK ARRAY CONTROLLER DRIVER
 P:      Achim Leubner
@@ -1836,10 +1862,10 @@ S:	Maintained
 HARDWARE MONITORING
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
-S:      Orphaned
+S:      Orphan
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
-S:      Orphaned
+S:      Orphan
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 P:      Robert Love
@@ -1982,7 +2008,7 @@ S:	Maintained
 I2C/SMBUS STUB DRIVER
 P:      Mark M. Hoffman
 M:      mhoffman@lightlink.com
-L:      lm-sensors@lm-sensors.org
+L:      i2c@lm-sensors.org
 S:      Maintained
 
 I2C SUBSYSTEM
@@ -2106,7 +2132,7 @@ M:	rolandd@cisco.com
 P:      Sean Hefty
 M:      sean.hefty@intel.com
 P:      Hal Rosenstock
-M:      hal.rosenstock@gmail.com 
+M:      hal.rosenstock@gmail.com
 L:      general@lists.openfabrics.org
 W:      http://www.openib.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
@@ -2319,6 +2345,12 @@ L:	video4linux-list@redhat.com
 W:      http://www.ivtvdriver.org
 S:      Maintained
 
+JME NETWORK DRIVER
+P:      Guo-Fu Tseng
+M:      cooldavid@cooldavid.org
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 P:      David Woodhouse
 M:      dwmw2@infradead.org
@@ -2694,17 +2726,18 @@ S:	Maintained
 
 MARVELL YUKON / SYSKONNECT DRIVER
 P:      Mirko Lindner
-M:      mlindner@syskonnect.de
+M:      mlindner@syskonnect.de
 P:      Ralph Roesler
-M:      rroesler@syskonnect.de
-W:      http://www.syskonnect.com
-S:      Supported
+M:      rroesler@syskonnect.de
+W:      http://www.syskonnect.com
+S:      Supported
 
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 P:      Michael Kerrisk
 M:      mtk.manpages@gmail.com
-W:     http://www.kernel.org/doc/man-pages
-S:     Supported
+W:      http://www.kernel.org/doc/man-pages
+L:      linux-man@vger.kernel.org
+S:      Supported
 
 MARVELL LIBERTAS WIRELESS DRIVER
 P:      Dan Williams
@@ -2733,7 +2766,7 @@ S:	Maintained
 MEGARAID SCSI DRIVERS
 P:      Neela Syam Kolli
 M:      megaraidlinux@lsi.com
-S:      linux-scsi@vger.kernel.org
+L:      linux-scsi@vger.kernel.org
 W:      http://megaraid.lsilogic.com
 S:      Maintained
 
@@ -2851,7 +2884,7 @@ MULTIMEDIA CARD (MMC) ETC. OVER SPI
 P:      David Brownell
 M:      dbrownell@users.sourceforge.net
 L:      linux-kernel@vger.kernel.org
-S:      Odd fixes
+S:      Odd Fixes
 
 MULTISOUND SOUND DRIVER
 P:      Andrew Veliath
@@ -2865,10 +2898,10 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
-P:     Felipe Balbi
-M:     felipe.balbi@nokia.com
-L:     linux-usb@vger.kernel.org
-S:     Maintained
+P:      Felipe Balbi
+M:      felipe.balbi@nokia.com
+L:      linux-usb@vger.kernel.org
+S:      Maintained
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 P:      Andrew Gallatin
@@ -2880,7 +2913,7 @@ W:	http://www.myri.com/scs/download-Myri10GE.html
 S:      Supported
 
 NATSEMI ETHERNET DRIVER (DP8381x)
-P:      Tim Hockin
+P:      Tim Hockin
 M:      thockin@hockin.org
 S:      Maintained
 
@@ -3099,7 +3132,7 @@ M:	laforge@gnumonks.org
 S:      Maintained
 
 OMNIVISION OV7670 SENSOR DRIVER
-P:      Jonathan Corbet
+P:      Jonathan Corbet
 M:      corbet@lwn.net
 L:      video4linux-list@redhat.com
 S:      Maintained
@@ -3209,7 +3242,7 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 S:      Supported
 
 PCI HOTPLUG CORE
-P:      Kristen Carlson Accardi
+P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
 S:      Supported
 
@@ -3383,6 +3416,13 @@ M:	linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
+QLOGIC QLGE 10Gb ETHERNET DRIVER
+P:      Ron Mercer
+M:      linux-driver@qlogic.com
+M:      ron.mercer@qlogic.com
+L:      netdev@vger.kernel.org
+S:      Supported
+
 QNX4 FILESYSTEM
 P:      Anders Larsen
 M:      al@alarsen.net
@@ -3649,7 +3689,8 @@ P:	Eric Paris
 M:      eparis@parisplace.org
 L:      linux-kernel@vger.kernel.org (kernel issues)
 L:      selinux@tycho.nsa.gov (subscribers-only, general discussion)
-W:      http://www.nsa.gov/selinux
+W:      http://selinuxproject.org
+T:      git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 S:      Supported
 
 SENSABLE PHANTOM
@@ -3724,7 +3765,7 @@ S:	Maintained
 SIS 96X I2C/SMBUS DRIVER
 P:      Mark M. Hoffman
 M:      mhoffman@lightlink.com
-L:      lm-sensors@lm-sensors.org
+L:      i2c@lm-sensors.org
 S:      Maintained
 
 SIS FRAMEBUFFER DRIVER
@@ -3766,10 +3807,10 @@ M:	bn@niasdigital.com
 S:      Maintained
 
 SOC-CAMERA V4L2 SUBSYSTEM
-P:     Guennadi Liakhovetski
-M:     g.liakhovetski@gmx.de
-L:     video4linux-list@redhat.com
-S:     Maintained
+P:      Guennadi Liakhovetski
+M:      g.liakhovetski@gmx.de
+L:      video4linux-list@redhat.com
+S:      Maintained
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:      Ingo Molnar
@@ -3826,16 +3867,19 @@ S:	Maintained
 SOUND
 P:      Jaroslav Kysela
 M:      perex@perex.cz
+P:      Takashi Iwai
+M:      tiwai@suse.de
 L:      alsa-devel@alsa-project.org (subscribers-only)
 S:      Maintained
 
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 P:      Liam Girdwood
-M:      liam.girdwood@wolfsonmicro.com
+M:      lrg@slimlogic.co.uk
 P:      Mark Brown
 M:      broonie@opensource.wolfsonmicro.com
 T:      git opensource.wolfsonmicro.com/linux-2.6-asoc
 L:      alsa-devel@alsa-project.org (subscribers-only)
+W:      http://alsa-project.org/main/index.php/ASoC
 S:      Supported
 
 SPI SUBSYSTEM
@@ -3923,7 +3967,7 @@ S:	Maintained
 
 STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
 W:      http://mosquitonet.Stanford.EDU/strip.html
-S:      Unsupported ?
+S:      Orphan
 
 STRADIS MPEG-2 DECODER DRIVER
 P:      Nathan Laredo
@@ -4004,9 +4048,9 @@ T:	git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
 S:      Maintained
 
 TI FLASH MEDIA INTERFACE DRIVER
-P:      Alex Dubov
-M:      oakad@yahoo.com
-S:      Maintained
+P:      Alex Dubov
+M:      oakad@yahoo.com
+S:      Maintained
 
 TI OMAP MMC INTERFACE DRIVER
 P:      Carlos Aguiar, Anderson Briglia and Syed Khasim
@@ -4152,13 +4196,13 @@ USB BLOCK DRIVER (UB ub)
 P:      Pete Zaitcev
 M:      zaitcev@redhat.com
 L:      linux-kernel@vger.kernel.org
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Supported
 
 USB CDC ETHERNET DRIVER
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 W:      http://www.kroah.com/linux-usb/
 
@@ -4185,13 +4229,13 @@ S:	Maintained
 USB EHCI DRIVER
 P:      David Brownell
 M:      dbrownell@users.sourceforge.net
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Odd Fixes
 
 USB ET61X[12]51 DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
@@ -4199,33 +4243,33 @@ S:	Maintained
 USB GADGET/PERIPHERAL SUBSYSTEM
 P:      David Brownell
 M:      dbrownell@users.sourceforge.net
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org/gadget
 S:      Maintained
 
 USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 P:      Jiri Kosina
 M:      jkosina@suse.cz
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
 S:      Maintained
 
 USB ISP116X DRIVER
 P:      Olav Kongas
 M:      ok@artecdesign.ee
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 
 USB KAWASAKI LSI DRIVER
 P:      Oliver Neukum
 M:      oliver@neukum.name
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 
 USB MASS STORAGE DRIVER
 P:      Matthew Dharm
 M:      mdharm-usb@one-eyed-alien.net
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      usb-storage@lists.one-eyed-alien.net
 S:      Maintained
 W:      http://www.one-eyed-alien.net/~mdharm/linux-usb/
@@ -4233,26 +4277,26 @@ W:	http://www.one-eyed-alien.net/~mdharm/linux-usb/
 USB OHCI DRIVER
 P:      David Brownell
 M:      dbrownell@users.sourceforge.net
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Odd Fixes
 
 USB OPTION-CARD DRIVER
 P:      Matthias Urlichs
 M:      smurf@smurf.noris.de
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 
 USB OV511 DRIVER
 P:      Mark McClelland
 M:      mmcclell@bigfoot.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 W:      http://alpha.dyndns.org/ov511/
 S:      Maintained
 
 USB PEGASUS DRIVER
 P:      Petko Manolov
 M:      petkan@users.sourceforge.net
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      netdev@vger.kernel.org
 W:      http://pegasus2.sourceforge.net/
 S:      Maintained
@@ -4260,13 +4304,13 @@ S:	Maintained
 USB PRINTER DRIVER (usblp)
 P:      Pete Zaitcev
 M:      zaitcev@redhat.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Supported
 
 USB RTL8150 DRIVER
 P:      Petko Manolov
 M:      petkan@users.sourceforge.net
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      netdev@vger.kernel.org
 W:      http://pegasus2.sourceforge.net/
 S:      Maintained
@@ -4274,20 +4318,20 @@ S:	Maintained
 USB SE401 DRIVER
 P:      Jeroen Vreeken
 M:      pe1rxq@amsat.org
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 W:      http://www.chello.nl/~j.vreeken/se401/
 S:      Maintained
 
 USB SERIAL BELKIN F5U103 DRIVER
 P:      William Greathouse
 M:      wgreathouse@smva.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 
 USB SERIAL CYPRESS M8 DRIVER
 P:      Lonnie Mendez
 M:      dignome@gmail.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 W:      http://geocities.com/i0xox0i
 W:      http://firstlight.net/cvs
@@ -4302,39 +4346,45 @@ USB SERIAL DIGI ACCELEPORT DRIVER
 P:      Peter Berger and Al Borchers
 M:      pberger@brimson.com
 M:      alborchers@steinerpoint.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 
 USB SERIAL DRIVER
 P:      Greg Kroah-Hartman
 M:      gregkh@suse.de
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Supported
 
 USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER
 P:      Gary Brubaker
 M:      xavyer@ix.netcom.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 
 USB SERIAL KEYSPAN DRIVER
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 W:      http://www.kroah.com/linux/
 S:      Maintained
 
 USB SERIAL WHITEHEAT DRIVER
 P:      Support Department
 M:      support@connecttech.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 W:      http://www.connecttech.com
 S:      Supported
 
+USB SMSC95XX ETHERNET DRIVER
+P:      Steve Glendinning
+M:      steve.glendinning@smsc.com
+L:      netdev@vger.kernel.org
+S:      Supported
+
 USB SN9C1xx DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
@@ -4342,7 +4392,7 @@ S:	Maintained
 USB SUBSYSTEM
 P:      Greg Kroah-Hartman
 M:      gregkh@suse.de
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org
 T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:      Supported
@@ -4350,7 +4400,7 @@ S:	Supported
 USB UHCI DRIVER
 P:      Alan Stern
 M:      stern@rowland.harvard.edu
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 S:      Maintained
 
 USB "USBNET" DRIVER FRAMEWORK
@@ -4363,7 +4413,7 @@ S:	Maintained
 USB VIDEO CLASS
 P:      Laurent Pinchart
 M:      laurent.pinchart@skynet.be
-L:      linx-uvc-devel@berlios.de
+L:      linux-uvc-devel@lists.berlios.de
 L:      video4linux-list@redhat.com
 W:      http://linux-uvc.berlios.de
 S:      Maintained
@@ -4371,7 +4421,7 @@ S:	Maintained
 USB W996[87]CF DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
@@ -4385,7 +4435,7 @@ S:	Maintained
 USB ZC0301 DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
@@ -4393,14 +4443,14 @@ S:	Maintained
 USB ZD1201 DRIVER
 P:      Jeroen Vreeken
 M:      pe1rxq@amsat.org
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 W:      http://linux-lc100020.sourceforge.net
 S:      Maintained
 
 USB ZR364XX DRIVER
 P:      Antoine Jacquet
 M:      royale@zerezo.com
-L:      linux-usb@vger.kernel.org
+L:      linux-usb@vger.kernel.org
 L:      video4linux-list@redhat.com
 W:      http://royale.zerezo.com/zr364xx/
 S:      Maintained