2.6.25-rc5-git7

diff --git a/MAINTAINERS b/MAINTAINERS
index 558636e..6d628fb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -266,6 +266,15 @@ L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
 S:      Maintained
 
+AD1889 ALSA SOUND DRIVER
+P:     Kyle McMartin
+M:     kyle@parisc-linux.org
+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
 M:   khali@linux-fr.org
@@ -2052,43 +2061,19 @@ M:   kernel@wantstofly.org
 L:   netdev@vger.kernel.org
 S:   Maintained
 
-INTEL PRO/100 ETHERNET SUPPORT
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
 P:   Auke Kok
 M:   auke-jan.h.kok@intel.com
 P:   Jesse Brandeburg
 M:   jesse.brandeburg@intel.com
 P:   Jeff Kirsher
 M:   jeffrey.t.kirsher@intel.com
+P:   Bruce Allan
+M:   bruce.w.allan@intel.com
 P:   John Ronciak
 M:   john.ronciak@intel.com
 L:   e1000-devel@lists.sourceforge.net
-W:   http://sourceforge.net/projects/e1000/
-S:   Supported
-
-INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
-P:   Auke Kok
-M:   auke-jan.h.kok@intel.com
-P:   Jesse Brandeburg
-M:   jesse.brandeburg@intel.com
-P:   Jeff Kirsher
-M:   jeffrey.t.kirsher@intel.com
-P:   John Ronciak
-M:   john.ronciak@intel.com
-L:   e1000-devel@lists.sourceforge.net
-W:   http://sourceforge.net/projects/e1000/
-S:   Supported
-
-INTEL PRO/10GbE SUPPORT
-P:   Ayyappan Veeraiyan
-M:   ayyappan.veeraiyan@intel.com
-P:   Auke Kok
-M:   auke-jan.h.kok@intel.com
-P:   Jesse Brandeburg
-M:   jesse.brandeburg@intel.com
-P:   John Ronciak
-M:   john.ronciak@intel.com
-L:   e1000-devel@lists.sourceforge.net
-W:   http://sourceforge.net/projects/e1000/
+W:   http://e1000.sourceforge.net/
 S:   Supported
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
@@ -2156,7 +2141,7 @@ L:   netdev@vger.kernel.org
 S:   Maintained
 
 IPATH DRIVER:
-P:   Arthur Jones
+P:   Ralph Campbell
 M:   infinipath@qlogic.com
 L:   general@lists.openfabrics.org
 T:   git git://git.qlogic.com/ipath-linux-2.6