1 files changed, 46 insertions, 32 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b42dcfcbee44..8f0ec46a7096 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -228,21 +228,21 @@ ACPI BATTERY DRIVERS
 P:      Alexey Starikovskiy
 M:      astarikovskiy@suse.de
 L:      linux-acpi@vger.kernel.org
-W:      http://acpi.sourceforge.net/
+W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI EC DRIVER
 P:      Alexey Starikovskiy
 M:      astarikovskiy@suse.de
 L:      linux-acpi@vger.kernel.org
-W:      http://acpi.sourceforge.net/
+W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI FAN DRIVER
 P:      Len Brown
 M:      len.brown@intel.com
 L:      linux-acpi@vger.kernel.org
-W:      http://acpi.sourceforge.net/
+W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI PCI HOTPLUG DRIVER
@@ -255,14 +255,14 @@ ACPI THERMAL DRIVER
 P:      Len Brown
 M:      len.brown@intel.com
 L:      linux-acpi@vger.kernel.org
-W:      http://acpi.sourceforge.net/
+W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI VIDEO DRIVER
 P:      Rui Zhang
 M:      rui.zhang@intel.com
 L:      linux-acpi@vger.kernel.org
-W:      http://acpi.sourceforge.net/
+W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
 
 ACPI WMI DRIVER
@@ -274,7 +274,7 @@ S:      Maintained
 
 AD1889 ALSA SOUND DRIVER
 P:     Kyle McMartin
-M:     kyle@parisc-linux.org
+M:     kyle@mcmartin.ca
 P:     Thibaut Varene
 M:     T-Bone@parisc-linux.org
 W:     http://wiki.parisc-linux.org/AD1889
@@ -995,8 +995,8 @@ L:	netdev@vger.kernel.org
 S:      Supported
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-P:      Eliezer Tamir
-M:      eliezert@broadcom.com
+P:      Eilon Greenstein
+M:      eilong@broadcom.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
@@ -1202,6 +1202,7 @@ M:	pj@sgi.com
 M:      menage@google.com
 L:      linux-kernel@vger.kernel.org
 W:      http://www.bullopensource.org/cpuset/
+W:      http://oss.sgi.com/projects/cpusets/
 S:      Supported
 
 CRAMFS FILESYSTEM
@@ -1240,6 +1241,20 @@ L:	video4linux-list@redhat.com
 W:      http://linuxtv.org
 S:      Maintained
 
+CXGB3 ETHERNET DRIVER (CXGB3)
+P:      Divy Le Ray
+M:      divy@chelsio.com
+L:      netdev@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+
+CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
+P:      Steve Wise
+M:      swise@chelsio.com
+L:      general@lists.openfabrics.org
+W:      http://www.openfabrics.org
+S:      Supported
+
 CYBERPRO FB DRIVER
 P:      Russell King
 M:      rmk@arm.linux.org.uk
@@ -1597,7 +1612,7 @@ ETHERNET BRIDGE
 P:      Stephen Hemminger
 M:      shemminger@linux-foundation.org
 L:      bridge@lists.linux-foundation.org
-W:      http://bridge.sourceforge.net/
+W:      http://www.linux-foundation.org/en/Net:Bridge
 S:      Maintained
 
 ETHERTEAM 16I DRIVER
@@ -1813,7 +1828,7 @@ S:	Maintained
 
 HARMONY SOUND DRIVER
 P:      Kyle McMartin
-M:      kyle@parisc-linux.org
+M:      kyle@mcmartin.ca
 L:      linux-parisc@vger.kernel.org
 S:      Maintained
 
@@ -2551,7 +2566,6 @@ LINUX SECURITY MODULE (LSM) FRAMEWORK
 P:      Chris Wright
 M:      chrisw@sous-sol.org
 L:      linux-security-module@vger.kernel.org
-W:      http://lsm.immunix.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
 S:      Supported
 
@@ -2852,8 +2866,8 @@ S:	Maintained
 NETEFFECT IWARP RNIC DRIVER (IW_NES)
 P:      Faisal Latif
 M:      flatif@neteffect.com
-P:      Nishi Gupta
-M:      ngupta@neteffect.com
+P:      Chien Tung
+M:      ctung@neteffect.com
 P:      Glenn Streiff
 M:      gstreiff@neteffect.com
 L:      general@lists.openfabrics.org
@@ -3107,7 +3121,7 @@ S:	Maintained
 
 PARISC ARCHITECTURE
 P:      Kyle McMartin
-M:      kyle@parisc-linux.org
+M:      kyle@mcmartin.ca
 P:      Matthew Wilcox
 M:      matthew@wil.cx
 P:      Grant Grundler
@@ -3251,7 +3265,7 @@ S:	Maintained
 
 PPP OVER ETHERNET
 P:      Michal Ostrowski
-M:      mostrows@speakeasy.net
+M:      mostrows@earthlink.net
 S:      Maintained
 
 PPP OVER L2TP
@@ -3316,9 +3330,11 @@ L:	video4linux-list@redhat.com
 W:      http://www.isely.net/pvrusb2/
 S:      Maintained
 
-PXA2xx SUPPORT
-P:      Nicolas Pitre
-M:      nico@cam.org
+PXA2xx/PXA3xx SUPPORT
+P:      Eric Miao
+M:      eric.miao@marvell.com
+P:      Russell King
+M:      linux@arm.linux.org.uk
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
@@ -3425,10 +3441,7 @@ L:	rtc-linux@googlegroups.com
 S:      Maintained
 
 REISERFS FILE SYSTEM
-P:      Hans Reiser
-M:      reiserfs-dev@namesys.com
 L:      reiserfs-devel@vger.kernel.org
-W:      http://www.namesys.com
 S:      Supported
 
 RFKILL
@@ -3648,13 +3661,6 @@ M:	romieu@fr.zoreil.com
 L:      netdev@vger.kernel.org
 S:      Maintained
 
-SIS 5513 IDE CONTROLLER DRIVER
-P:      Lionel Bouton
-M:      Lionel.Bouton@inet6.fr
-W:      http://inet6.dyn.dhs.org/sponsoring/sis5513/index.html
-W:      http://gyver.homeip.net/sis5513/index.html
-S:      Maintained
-
 SIS 900/7016 FAST ETHERNET DRIVER
 P:      Daniele Venzano
 M:      venza@brownhat.org
@@ -4020,7 +4026,7 @@ TULIP NETWORK DRIVERS
 P:      Grant Grundler
 M:      grundler@parisc-linux.org
 P:      Kyle McMartin
-M:      kyle@parisc-linux.org
+M:      kyle@mcmartin.ca
 L:      netdev@vger.kernel.org
 S:      Maintained
 
@@ -4361,6 +4367,14 @@ M:	gregkh@suse.de
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+UTIL-LINUX-NG PACKAGE
+P:      Karel Zak
+M:      kzak@redhat.com
+L:      util-linux-ng@vger.kernel.org
+W:      http://kernel.org/~kzak/util-linux-ng/
+T:      git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
+S:      Maintained
+
 VFAT/FAT/MSDOS FILESYSTEM:
 P:      OGAWA Hirofumi
 M:      hirofumi@mail.parknet.co.jp
@@ -4417,10 +4431,10 @@ M:	johnpol@2ka.mipt.ru
 S:      Maintained
 
 W83791D HARDWARE MONITORING DRIVER
-P:      Charles Spirakis
-M:      bezaur@gmail.com
+P:      Marc Hulsman
+M:      m.hulsman@tudelft.nl
 L:      lm-sensors@lm-sensors.org
-S:      Odd Fixes
+S:      Maintained
 
 W83793 HARDWARE MONITORING DRIVER
 P:      Rudolf Marek