Merge branch 'linus' into x86/timers

1 files changed, 132 insertions, 86 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f5583dc7ea39..cd587eec9fa7 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
@@ -367,12 +367,12 @@ S:	Maintained for 2.4; PCI support for 2.6.
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 P:      Thomas Dahlmann
 M:      thomas.dahlmann@amd.com
-L:      info-linux@geode.amd.com        (subscribers-only)
+L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 
 AMD GEODE PROCESSOR/CHIPSET SUPPORT
 P:      Jordan Crouse
-L:      info-linux@geode.amd.com        (subscribers-only)
+L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
 
@@ -982,13 +982,6 @@ L:	bonding-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/bonding/
 S:      Supported
 
-BROADBAND PROCESSOR ARCHITECTURE
-P:      Arnd Bergmann
-M:      arnd@arndb.de
-L:      linuxppc-dev@ozlabs.org
-W:      http://www.penguinppc.org/ppc64/
-S:      Supported
-
 BROADCOM B44 10/100 ETHERNET DRIVER
 P:      Gary Zambrano
 M:      zambrano@broadcom.com
@@ -1002,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
 
@@ -1052,6 +1045,14 @@ L:	linux-kernel@vger.kernel.org
 L:      discuss@x86-64.org
 S:      Maintained
 
+CELL BROADBAND ENGINE ARCHITECTURE
+P:      Arnd Bergmann
+M:      arnd@arndb.de
+L:      linuxppc-dev@ozlabs.org
+L:      cbe-oss-dev@ozlabs.org
+W:      http://www.ibm.com/developerworks/power/cell/
+S:      Supported
+
 CFAG12864B LCD DRIVER
 P:      Miguel Ojeda Sandonis
 M:      maxextreme@gmail.com
@@ -1201,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
@@ -1230,6 +1232,29 @@ P:	Jaya Kumar
 M:      jayakumar.alsa@gmail.com
 S:      Maintained
 
+CX18 VIDEO4LINUX DRIVER
+P:      Hans Verkuil, Andy Walls
+M:      hverkuil@xs4all.nl, awalls@radix.net
+L:      ivtv-devel@ivtvdriver.org
+L:      ivtv-users@ivtvdriver.org
+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
@@ -1587,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
@@ -1636,8 +1661,10 @@ W:	http://linux-fbdev.sourceforge.net/
 S:      Maintained
 
 FREESCALE DMA DRIVER
-P;      Zhang Wei
-M:      wei.zhang@freescale.com
+P:      Li Yang
+M:      leoli@freescale.com
+P:      Zhang Wei
+M:      zw@zh-kernel.org
 L:      linuxppc-embedded@ozlabs.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
@@ -1801,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
 
@@ -1931,8 +1958,10 @@ L:	lm-sensors@lm-sensors.org
 S:      Maintained
 
 I2C SUBSYSTEM
-P:      Jean Delvare
+P:      Jean Delvare (PC drivers, core)
 M:      khali@linux-fr.org
+P:      Ben Dooks (embedded platforms)
+M:      ben-linux@fluff.org
 L:      i2c@lm-sensors.org
 T:      quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
 S:      Maintained
@@ -2318,7 +2347,8 @@ S:	Maintained
 KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
 P:      Sam Ravnborg
 M:      sam@ravnborg.org
-T:      git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-next.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
 L:      linux-kbuild@vger.kernel.org
 S:      Maintained
 
@@ -2340,24 +2370,24 @@ S:	Supported
 KERNEL VIRTUAL MACHINE (KVM)
 P:      Avi Kivity
 M:      avi@qumranet.com
-L:      kvm-devel@lists.sourceforge.net
-W:      kvm.sourceforge.net
+L:      kvm@vger.kernel.org
+W:      http://kvm.qumranet.com
 S:      Supported
 
 KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 P:      Hollis Blanchard
 M:      hollisb@us.ibm.com
-L:      kvm-ppc-devel@lists.sourceforge.net
-W:      kvm.sourceforge.net
+L:      kvm-ppc@vger.kernel.org
+W:      http://kvm.qumranet.com
 S:      Supported
 
-KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64)
+KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
 P:      Anthony Xu
 M:      anthony.xu@intel.com
 P:      Xiantao Zhang
 M:      xiantao.zhang@intel.com
-L:      kvm-ia64-devel@lists.sourceforge.net
-W:      kvm.sourceforge.net
+L:      kvm-ia64@vger.kernel.org
+W:      http://kvm.qumranet.com
 S:      Supported
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
@@ -2536,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
 
@@ -2808,6 +2837,15 @@ M:	jirislaby@gmail.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
+P:      Andrew Gallatin
+M:      gallatin@myri.com
+P:      Brice Goglin
+M:      brice@myri.com
+L:      netdev@vger.kernel.org
+W:      http://www.myri.com/scs/download-Myri10GE.html
+S:      Supported
+
 NATSEMI ETHERNET DRIVER (DP8381x)
 P:      Tim Hockin
 M:      thockin@hockin.org
@@ -2828,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
@@ -3083,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
@@ -3121,7 +3159,7 @@ PCI ERROR RECOVERY
 P:      Linas Vepstas
 M:      linas@austin.ibm.com
 L:      linux-kernel@vger.kernel.org
-L:      linux-pci@atrey.karlin.mff.cuni.cz
+L:      linux-pci@vger.kernel.org
 S:      Supported
 
 PCI SUBSYSTEM
@@ -3227,7 +3265,7 @@ S:	Maintained
 
 PPP OVER ETHERNET
 P:      Michal Ostrowski
-M:      mostrows@speakeasy.net
+M:      mostrows@earthlink.net
 S:      Maintained
 
 PPP OVER L2TP
@@ -3292,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
 
@@ -3401,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
@@ -3624,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
@@ -3755,6 +3785,14 @@ M:	dbrownell@users.sourceforge.net
 L:      spi-devel-general@lists.sourceforge.net
 S:      Maintained
 
+SPU FILE SYSTEM
+P:      Jeremy Kerr
+M:      jk@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
+L:      cbe-oss-dev@ozlabs.org
+W:      http://www.ibm.com/developerworks/power/cell/
+S:      Supported
+
 STABLE BRANCH:
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
@@ -3988,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
 
@@ -4010,12 +4048,41 @@ M:	ballabio_dario@emc.com
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 
+UCLINUX (AND M68KNOMMU)
+P:      Greg Ungerer
+M:      gerg@uclinux.org
+W:      http://www.uclinux.org/
+L:      uclinux-dev@uclinux.org  (subscribers-only)
+S:      Maintained
+
+UCLINUX FOR NEC V850
+P:      Miles Bader
+
+UCLINUX FOR RENESAS H8/300
+P:      Yoshinori Sato
+M:      ysato@users.sourceforge.jp
+W:      http://uclinux-h8.sourceforge.jp/
+S:      Supported
+
 UDF FILESYSTEM
 P:      Jan Kara
 M:      jack@suse.cz
 W:      http://linux-udf.sourceforge.net
 S:      Maintained
 
+UFS FILESYSTEM
+P:      Evgeniy Dushistov
+M:      dushistov@mail.ru
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
+UltraSPARC (sparc64):
+P:      David S. Miller
+M:      davem@davemloft.net
+L:      sparclinux@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
+S:      Maintained
+
 UNIFORM CDROM DRIVER
 P:      Jens Axboe
 M:      axboe@kernel.dk
@@ -4062,6 +4129,13 @@ L:	netdev@vger.kernel.org
 W:      http://www.linux-usb.org/usbnet
 S:      Maintained
 
+USB DIAMOND RIO500 DRIVER
+P:      Cesar Miquel
+M:      miquel@df.uba.ar
+L:      rio500-users@lists.sourceforge.net
+W:      http://rio500.sourceforge.net
+S:      Maintained
+
 USB EHCI DRIVER
 P:      David Brownell
 M:      dbrownell@users.sourceforge.net
@@ -4293,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
@@ -4316,42 +4398,6 @@ M:	romieu@fr.zoreil.com
 L:      netdev@vger.kernel.org
 S:      Maintained
 
-UCLINUX (AND M68KNOMMU)
-P:      Greg Ungerer
-M:      gerg@uclinux.org
-W:      http://www.uclinux.org/
-L:      uclinux-dev@uclinux.org  (subscribers-only)
-S:      Maintained
-
-UCLINUX FOR NEC V850
-P:      Miles Bader
-
-UCLINUX FOR RENESAS H8/300
-P:      Yoshinori Sato
-M:      ysato@users.sourceforge.jp
-W:      http://uclinux-h8.sourceforge.jp/
-S:      Supported
-
-UFS FILESYSTEM
-P:      Evgeniy Dushistov
-M:      dushistov@mail.ru
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
-UltraSPARC (sparc64):
-P:      David S. Miller
-M:      davem@davemloft.net
-L:      sparclinux@vger.kernel.org
-T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
-S:      Maintained
-
-USB DIAMOND RIO500 DRIVER
-P:      Cesar Miquel
-M:      miquel@df.uba.ar
-L:      rio500-users@lists.sourceforge.net
-W:      http://rio500.sourceforge.net
-S:      Maintained
-
 VIDEO FOR LINUX
 P:      Mauro Carvalho Chehab
 M:      mchehab@infradead.org