Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

1 files changed, 248 insertions, 156 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f12d73142a0..df3fa0e42f2e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -216,8 +216,8 @@ W:	http://code.google.com/p/aceracpi
 S:      Maintained
 
 ACPI
-P:      Len Brown
-M:      len.brown@intel.com
+P:      Andi Kleen
+M:      ak@linux.intel.com
 M:      lenb@kernel.org
 L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
@@ -228,41 +228,41 @@ 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
+P:      Zhang Rui
+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 PCI HOTPLUG DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
-L:      pcihpd-discuss@lists.sourceforge.net
+L:      linux-pci@vger.kernel.org
 S:      Supported
 
 ACPI THERMAL DRIVER
-P:      Len Brown
-M:      len.brown@intel.com
+P:      Zhang Rui
+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 VIDEO DRIVER
-P:      Rui Zhang
+P:      Zhang Rui
 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
@@ -348,7 +348,9 @@ W:	http://www.linux-usb.org/SpeedTouch/
 S:      Maintained
 
 ALCHEMY AU1XX0 MMC DRIVER
-S:      Orphan
+P:      Manuel Lauss
+M:      manuel.lauss@gmail.com
+S:      Maintained
 
 ALI1563 I2C DRIVER
 P:      Rudolf Marek
@@ -376,6 +378,12 @@ 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
 
+AMD IOMMU (AMD-VI)
+P:      Joerg Roedel
+M:      joerg.roedel@amd.com
+L:      iommu@lists.linux-foundation.org
+S:      Supported
+
 AMS (Apple Motion Sensor) DRIVER
 P:      Stelian Pop
 M:      stelian@popies.net
@@ -763,9 +771,10 @@ S:	Maintained
 
 AUXILIARY DISPLAY DRIVERS
 P:      Miguel Ojeda Sandonis
-M:      maxextreme@gmail.com
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 AVR32 ARCHITECTURE
@@ -982,13 +991,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 +1004,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,18 +1054,28 @@ 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
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 CFAG12864BFB LCD FRAMEBUFFER DRIVER
 P:      Miguel Ojeda Sandonis
-M:      maxextreme@gmail.com
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 CFG80211 and NL80211
@@ -1133,23 +1145,28 @@ COMPACTPCI HOTPLUG CORE
 P:      Scott Murray
 M:      scottm@somanetworks.com
 M:      scott@spiteful.org
-L:      pcihpd-discuss@lists.sourceforge.net
+L:      linux-pci@vger.kernel.org
 S:      Supported
 
 COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
 P:      Scott Murray
 M:      scottm@somanetworks.com
 M:      scott@spiteful.org
-L:      pcihpd-discuss@lists.sourceforge.net
+L:      linux-pci@vger.kernel.org
 S:      Supported
 
 COMPACTPCI HOTPLUG GENERIC DRIVER
 P:      Scott Murray
 M:      scottm@somanetworks.com
 M:      scott@spiteful.org
-L:      pcihpd-discuss@lists.sourceforge.net
+L:      linux-pci@vger.kernel.org
 S:      Supported
 
+COMPAL LAPTOP SUPPORT
+P:      Cezary Jackiewicz
+M:      cezary.jackiewicz@gmail.com
+S:      Maintained
+
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:      Michael H. Warfield
 M:      mhw@wittsend.com
@@ -1201,6 +1218,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
@@ -1239,6 +1257,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
@@ -1404,6 +1436,14 @@ M:	kristen.c.accardi@intel.com
 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
+
 DOUBLETALK DRIVER
 P:      James R. Van Zandt
 M:      jrv@vanzandt.mv.com
@@ -1596,7 +1636,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
@@ -1610,13 +1650,13 @@ S:	Maintained
 
 EXT3 FILE SYSTEM
 P:      Stephen Tweedie, Andrew Morton
-M:      sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com
+M:      sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
 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@clusterfs.com
+M:      sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
 L:      linux-ext4@vger.kernel.org
 S:      Maintained
 
@@ -1645,12 +1685,21 @@ 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
 
+FREESCALE I2C CPM DRIVER
+P:      Jochen Friedrich
+M:      jochen@scram.de
+L:      linuxppc-dev@ozlabs.org
+L:      i2c@lm-sensors.org
+S:      Maintained
+
 FREESCALE SOC FS_ENET DRIVER
 P:      Pantelis Antoniou
 M:      pantelis.antoniou@gmail.com
@@ -1735,11 +1784,22 @@ M:	hch@infradead.org
 W:      ftp://ftp.openlinux.org/pub/people/hch/vxfs
 S:      Maintained
 
+FTRACE
+P:      Steven Rostedt
+M:      srostedt@redhat.com
+S:      Maintained
+
 FUJITSU FR-V (FRV) PORT
 P:      David Howells
 M:      dhowells@redhat.com
 S:      Maintained
 
+FUJITSU LAPTOP EXTRAS
+P:      Jonathan Woithe
+M:      jwoithe@physics.adelaide.edu.au
+L:      linux-acpi@vger.kernel.org
+S:      Maintained
+
 FUSE: FILESYSTEM IN USERSPACE
 P:      Miklos Szeredi
 M:      miklos@szeredi.hu
@@ -1810,7 +1870,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
 
@@ -1946,8 +2006,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
@@ -2133,6 +2195,8 @@ P:	Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
 P:      Bruce Allan
 M:      bruce.w.allan@intel.com
+P:      PJ Waskiewicz
+M:      peter.p.waskiewicz.jr@intel.com
 P:      John Ronciak
 M:      john.ronciak@intel.com
 L:      e1000-devel@lists.sourceforge.net
@@ -2282,6 +2346,16 @@ L:	linux-mtd@lists.infradead.org
 W:      http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:      Maintained
 
+UBI FILE SYSTEM (UBIFS)
+P:      Artem Bityutskiy
+M:      dedekind@infradead.org
+P:      Adrian Hunter
+M:      ext-adrian.hunter@nokia.com
+L:      linux-mtd@lists.infradead.org
+T:      git git://git.infradead.org/~dedekind/ubifs-2.6.git
+W:      http://www.linux-mtd.infradead.org/doc/ubifs.html
+S:      Maintained
+
 JFS FILESYSTEM
 P:      Dave Kleikamp
 M:      shaggy@austin.ibm.com
@@ -2333,7 +2407,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
 
@@ -2355,24 +2430,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)
@@ -2413,9 +2488,10 @@ S:	Maintained
 
 KS0108 LCD CONTROLLER DRIVER
 P:      Miguel Ojeda Sandonis
-M:      maxextreme@gmail.com
+M:      miguel.ojeda.sandonis@gmail.com
 L:      linux-kernel@vger.kernel.org
-W:      http://auxdisplay.googlepages.com/
+W:      http://miguelojeda.es/auxdisplay.htm
+W:      http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:      Maintained
 
 LAPB module
@@ -2459,9 +2535,11 @@ M:	James.Bottomley@HansenPartnership.com
 W:      http://www.hansenpartnership.com/voyager
 S:      Maintained
 
-LINUX FOR POWERPC
+LINUX FOR POWERPC (32-BIT AND 64-BIT)
 P:      Paul Mackerras
 M:      paulus@samba.org
+P:      Benjamin Herrenschmidt
+M:      benh@kernel.crashing.org
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
@@ -2474,13 +2552,11 @@ W:	http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
-LINUX FOR POWERPC EMBEDDED MPC52XX
+LINUX FOR POWERPC EMBEDDED MPC5XXX
 P:      Sylvain Munaut
 M:      tnt@246tNt.com
 P:      Grant Likely
 M:      grant.likely@secretlab.ca
-W:      http://www.246tNt.com/mpc52xx/
-W:      http://www.penguinppc.org/
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
@@ -2501,13 +2577,6 @@ W:	http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
-LINUX FOR POWERPC BOOT CODE
-P:      Tom Rini
-M:      trini@kernel.crashing.org
-W:      http://www.penguinppc.org/
-L:      linuxppc-dev@ozlabs.org
-S:      Maintained
-
 LINUX FOR POWERPC EMBEDDED PPC8XX
 P:      Vitaly Bordug
 M:      vitb@kernel.crashing.org
@@ -2536,22 +2605,10 @@ P:	Arnaldo Carvalho de Melo
 M:      acme@ghostprotocols.net
 S:      Maintained
 
-LINUX FOR 64BIT POWERPC
-P:      Paul Mackerras
-M:      paulus@samba.org
-M:      paulus@au.ibm.com
-P:      Anton Blanchard
-M:      anton@samba.org
-M:      anton@au.ibm.com
-W:      http://www.penguinppc.org/ppc64/
-L:      linuxppc-dev@ozlabs.org
-S:      Supported
-
 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
 
@@ -2666,8 +2723,8 @@ S: 	Supported
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 P:      Michael Kerrisk
 M:      mtk.manpages@gmail.com
-W:      ftp://ftp.kernel.org/pub/linux/docs/manpages
-S:      Maintained
+W:     http://www.kernel.org/doc/man-pages
+S:     Supported
 
 MARVELL LIBERTAS WIRELESS DRIVER
 P:      Dan Williams
@@ -2676,12 +2733,10 @@ L:	libertas-dev@lists.infradead.org
 S:      Maintained
 
 MARVELL MV643XX ETHERNET DRIVER
-P:      Dale Farnsworth
-M:      dale@farnsworth.org
-P:      Manish Lachwani
-M:      mlachwani@mvista.com
+P:      Lennert Buytenhek
+M:      buytenh@marvell.com
 L:      netdev@vger.kernel.org
-S:      Odd Fixes for 2.4; Maintained for 2.6.
+S:      Supported
 
 MATROX FRAMEBUFFER DRIVER
 P:      Petr Vandrovec
@@ -2800,6 +2855,12 @@ W:	https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:      http://0pointer.de/lennart/tchibo.html
 S:      Maintained
 
+MULTIFUNCTION DEVICES (MFD)
+P:      Samuel Ortiz
+M:      sameo@openedhand.com
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 P:      Pierre Ossman
 M:      drzeus-mmc@drzeus.cx
@@ -2823,6 +2884,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
@@ -2843,8 +2913,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
@@ -3057,8 +3127,8 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 
 OPROFILE
-P:      Philippe Elie
-M:      phil.el@wanadoo.fr
+P:      Robert Richter
+M:      robert.richter@amd.com
 L:      oprofile-list@lists.sf.net
 S:      Maintained
 
@@ -3098,7 +3168,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
@@ -3136,7 +3206,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
@@ -3155,7 +3225,7 @@ S:	Supported
 PCIE HOTPLUG DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
-L:      pcihpd-discuss@lists.sourceforge.net
+L:      linux-pci@vger.kernel.org
 S:      Supported
 
 PCMCIA SUBSYSTEM
@@ -3172,8 +3242,8 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 
 PER-TASK DELAY ACCOUNTING
-P:      Shailabh Nagar
-M:      nagar@watson.ibm.com
+P:      Balbir Singh
+M:      balbir@linux.vnet.ibm.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -3210,14 +3280,6 @@ L:	linux-kernel@vger.kernel.org
 T:      git git.infradead.org/battery-2.6.git
 S:      Maintained
 
-POWERPC 4xx EMAC DRIVER
-P:      Eugene Surovegin
-M:      ebs@ebshome.net
-W:      http://kernel.ebshome.net/emac/
-L:      linuxppc-dev@ozlabs.org
-L:      netdev@vger.kernel.org
-S:      Maintained
-
 PNP SUPPORT
 P:      Adam Belay
 M:      ambx1@neo.rr.com
@@ -3242,7 +3304,7 @@ S:	Maintained
 
 PPP OVER ETHERNET
 P:      Michal Ostrowski
-M:      mostrows@speakeasy.net
+M:      mostrows@earthlink.net
 S:      Maintained
 
 PPP OVER L2TP
@@ -3307,9 +3369,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
 
@@ -3416,10 +3480,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
@@ -3498,6 +3559,13 @@ L:	linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 
+S3C24XX SD/MMC Driver
+P:      Ben Dooks
+M:      ben-linux@fluff.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 SAA7146 VIDEO4LINUX-2 DRIVER
 P:      Michael Hunold
 M:      michael@mihu.de
@@ -3570,6 +3638,12 @@ P:	Jim Cromie
 M:      jim.cromie@gmail.com
 S:      Maintained
 
+SDRICOH_CS MMC/SD HOST CONTROLLER INTERFACE DRIVER
+P:      Sascha Sommer
+M:      saschasommer@freenet.de
+L:      sdricohcs-devel@lists.sourceforge.net (subscribers-only)
+S:      Maintained
+
 SECURITY CONTACT
 P:      Security Officers
 M:      security@kernel.org
@@ -3639,13 +3713,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
@@ -3673,7 +3740,7 @@ S:	Maintained
 
 SLAB ALLOCATOR
 P:      Christoph Lameter
-M:      clameter@sgi.com
+M:      cl@linux-foundation.org
 P:      Pekka Enberg
 M:      penberg@cs.helsinki.fi
 P:      Matt Mackall
@@ -3770,6 +3837,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
@@ -3788,7 +3863,7 @@ S:	Maintained
 SHPC HOTPLUG DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
-L:      pcihpd-discuss@lists.sourceforge.net
+L:      linux-pci@vger.kernel.org
 S:      Supported
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER
@@ -3875,8 +3950,8 @@ M:	hch@infradead.org
 S:      Maintained
 
 TASKSTATS STATISTICS INTERFACE
-P:      Shailabh Nagar
-M:      nagar@watson.ibm.com
+P:      Balbir Singh
+M:      balbir@linux.vnet.ibm.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -3972,7 +4047,8 @@ W:	http://www.buzzard.org.uk/toshiba/
 S:      Maintained
 
 TPM DEVICE DRIVER
-P:      Kylene Hall
+P:     Debora Velarde
+P:     Rajiv Andrade
 M:      tpmdd-devel@lists.sourceforge.net
 W:      http://tpmdd.sourceforge.net
 P:      Marcel Selhorst
@@ -4003,7 +4079,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
 
@@ -4025,12 +4101,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
@@ -4077,6 +4182,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
@@ -4255,6 +4367,14 @@ L:	netdev@vger.kernel.org
 W:      http://www.linux-usb.org/usbnet
 S:      Maintained
 
+USB VIDEO CLASS
+P:      Laurent Pinchart
+M:      laurent.pinchart@skynet.be
+L:      linx-uvc-devel@berlios.de
+L:      video4linux-list@redhat.com
+W:      http://linux-uvc.berlios.de
+S:      Maintained
+
 USB W996[87]CF DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
@@ -4308,6 +4428,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
@@ -4331,42 +4459,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
@@ -4400,10 +4492,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