Merge branch 'linus'

1 files changed, 21 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8db5c339845d..bfd7fbfe90ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -534,7 +534,7 @@ S:   Supported
 BROADBAND PROCESSOR ARCHITECTURE
 P:      Arnd Bergmann
 M:      arnd@arndb.de
-L:      linuxppc64-dev@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 W:      http://linuxppc64.org
 S:      Supported
 
@@ -1349,10 +1349,10 @@ S:	Maintained
 INTEL PRO/100 ETHERNET SUPPORT
 P:      John Ronciak
 M:      john.ronciak@intel.com
-P:      Ganesh Venkatesan
-M:      ganesh.venkatesan@intel.com
 P:      Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
+P:      Jeff Kirsher
+M:      jeffrey.t.kirsher@intel.com
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1361,18 +1361,22 @@ P:	Jeb Cramer
 M:      cramerj@intel.com
 P:      John Ronciak
 M:      john.ronciak@intel.com
-P:      Ganesh Venkatesan
-M:      ganesh.venkatesan@intel.com
+P:      Jesse Brandeburg
+M:      jesse.brandeburg@intel.com
+P:      Jeff Kirsher
+M:      jeffrey.t.kirsher@intel.com
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
 INTEL PRO/10GbE SUPPORT
+P:      Jeff Kirsher
+M:      jeffrey.t.kirsher@intel.com
 P:      Ayyappan Veeraiyan
 M:      ayyappan.veeraiyan@intel.com
-P:      Ganesh Venkatesan
-M:      ganesh.venkatesan@intel.com
 P:      John Ronciak
 M:      john.ronciak@intel.com
+P:      Jesse Brandeburg
+M:      jesse.brandeburg@intel.com
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1524,12 +1528,6 @@ M:	davem@davemloft.net
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-LANMEDIA WAN CARD DRIVER
-P:      Andrew Stanley-Jones
-M:      asj@lanmedia.com
-W:      http://www.lanmedia.com/
-S:      Supported
- 
 LAPB module
 P:      Henner Eisen
 M:      eis@baty.hanse.de
@@ -1626,7 +1624,7 @@ P:	Anton Blanchard
 M:      anton@samba.org
 M:      anton@au.ibm.com
 W:      http://linuxppc64.org
-L:      linuxppc64-dev@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 S:      Supported
 
 LINUX SECURITY MODULE (LSM) FRAMEWORK
@@ -2147,7 +2145,7 @@ S:	Maintained
 
 QLOGIC QLA2XXX FC-SCSI DRIVER
 P:      Andrew Vasquez
-M:      andrew.vasquez@qlogic.com
+M:      linux-driver@qlogic.com
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 
@@ -2902,6 +2900,14 @@ L:	video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
 
+USB ZC0301 DRIVER
+P:      Luca Risolia
+M:      luca.risolia@studio.unibo.it
+L:      linux-usb-devel@lists.sourceforge.net
+L:      video4linux-list@redhat.com
+W:      http://www.linux-projects.org
+S:      Maintained
+
 USB ZD1201 DRIVER
 P:      Jeroen Vreeken
 M:      pe1rxq@amsat.org