Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

1 files changed, 158 insertions, 40 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 61c190a15b5d..2cb7566904b1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -71,7 +71,7 @@ P: Person
 M: Mail patches to
 L: Mailing list that is relevant to this area
 W: Web-page with status/info
-T: SCM tree type and location.  Type is one of: git, hg, quilt.
+T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
 S: Status, one of the following:
 
         Supported:      Someone is actually paid to look after this.
@@ -159,7 +159,8 @@ F:	drivers/net/r8169.c
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 L:      linux-serial@vger.kernel.org
 W:      http://serial.sourceforge.net
-S:      Orphan
+M:      alan@lxorguk.ukuu.org.uk
+S:      Odd Fixes
 F:      drivers/serial/8250*
 F:      include/linux/serial_8250.h
 
@@ -434,7 +435,7 @@ F:	arch/alpha/
 
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 P:      Thomas Dahlmann
-M:      thomas.dahlmann@amd.com
+M:      dahlmann.thomas@arcor.de
 L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 F:      drivers/usb/gadget/amd5536udc.*
@@ -624,6 +625,7 @@ M:	paulius.zaleckas@teltonika.lt
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 T:      git git://gitorious.org/linux-gemini/mainline.git
 S:      Maintained
+F:      arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
 P:      Russell King
@@ -650,6 +652,7 @@ P:	Paulius Zaleckas
 M:      paulius.zaleckas@teltonika.lt
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
+F:      arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
 P:      Russell King
@@ -678,6 +681,13 @@ M:	sakoman@gmail.com
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
+ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
+P:      Philipp Zabel
+M:      philipp.zabel@gmail.com
+S:      Maintained
+F:      arch/arm/mach-pxa/hx4700.c
+F:      arch/arm/mach-pxa/include/mach/hx4700.h
+
 ARM/HP JORNADA 7XX MACHINE SUPPORT
 P:      Kristoffer Ericson
 M:      kristoffer.ericson@gmail.com
@@ -1138,17 +1148,17 @@ F:	fs/bfs/
 F:      include/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
-P:      Bryan Wu
-M:      cooloney@kernel.org
+P:      Mike Frysinger
+M:      vapier@gentoo.org
 L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      arch/blackfin/
 
 BLACKFIN EMAC DRIVER
-P:      Bryan Wu
-M:      cooloney@kernel.org
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+P:      Michael Hennerich
+M:      michael.hennerich@analog.com
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/net/bfin_mac.*
@@ -1156,7 +1166,7 @@ F:	drivers/net/bfin_mac.*
 BLACKFIN RTC DRIVER
 P:      Mike Frysinger
 M:      vapier.adi@gmail.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/rtc/rtc-bfin.c
@@ -1164,7 +1174,7 @@ F:	drivers/rtc/rtc-bfin.c
 BLACKFIN SERIAL DRIVER
 P:      Sonic Zhang
 M:      sonic.zhang@analog.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/serial/bfin_5xx.c
@@ -1172,7 +1182,7 @@ F:	drivers/serial/bfin_5xx.c
 BLACKFIN WATCHDOG DRIVER
 P:      Mike Frysinger
 M:      vapier.adi@gmail.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/watchdog/bfin_wdt.c
@@ -1180,7 +1190,7 @@ F:	drivers/watchdog/bfin_wdt.c
 BLACKFIN I2C TWI DRIVER
 P:      Sonic Zhang
 M:      sonic.zhang@analog.com
-L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      drivers/i2c/busses/i2c-bfin-twi.c
@@ -1444,6 +1454,14 @@ P:	Russell King
 M:      linux@arm.linux.org.uk
 F:      include/linux/clk.h
 
+CISCO FCOE HBA DRIVER
+P:      Abhijeet Joglekar
+M:      abjoglek@cisco.com
+P:      Joe Eykholt
+M:      jeykholt@cisco.com
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+
 CODA FILE SYSTEM
 P:      Jan Harkes
 M:      jaharkes@cs.cmu.edu
@@ -1804,10 +1822,10 @@ F:	drivers/char/epca*
 F:      drivers/char/digi*
 
 DIRECTORY NOTIFICATION (DNOTIFY)
-P:      Stephen Rothwell
-M:      sfr@canb.auug.org.au
+P:      Eric Paris
+M:      eparis@parisplace.org
 L:      linux-kernel@vger.kernel.org
-S:      Supported
+S:      Maintained
 F:      Documentation/filesystems/dnotify.txt
 F:      fs/notify/dnotify/
 F:      include/linux/dnotify.h
@@ -1981,10 +1999,20 @@ F:	Documentation/edac.txt
 F:      drivers/edac/edac_*
 F:      include/linux/edac.h
 
+EDAC-AMD64
+P:      Doug Thompson
+M:      dougthompson@xmission.com
+P:      Borislav Petkov
+M:      borislav.petkov@amd.com
+L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
+W:      bluesmoke.sourceforge.net
+S:      Supported
+F:      drivers/edac/amd64_edac*
+
 EDAC-E752X
 P:      Mark Gross
-P:      Doug Thompson
 M:      mark.gross@intel.com
+P:      Doug Thompson
 M:      dougthompson@xmission.com
 L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      bluesmoke.sourceforge.net
@@ -2097,6 +2125,15 @@ W:	http://sourceforge.net/projects/lpfcxxxx
 S:      Supported
 F:      drivers/scsi/lpfc/
 
+ENE CB710 FLASH CARD READER DRIVER
+P:      Michał Mirosław
+M:      mirq-linux@rere.qmqm.pl
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/misc/cb710/
+F:      drivers/mmc/host/cb710-mmc.*
+F:      include/linux/cb710.h
+
 EPSON 1355 FRAMEBUFFER DRIVER
 P:      Christopher Hoover
 M:      ch@murgatroid.com
@@ -2261,7 +2298,7 @@ P:	Li Yang
 M:      leoli@freescale.com
 P:      Zhang Wei
 M:      zw@zh-kernel.org
-L:      linuxppc-embedded@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/dma/fsldma.*
@@ -2343,7 +2380,7 @@ F:	fs/freevxfs/
 
 FREEZER
 P:      Pavel Machek
-M:      pavel@suse.cz
+M:      pavel@ucw.cz
 P:      Rafael J. Wysocki
 M:      rjw@sisk.pl
 L:      linux-pm@lists.linux-foundation.org
@@ -2862,6 +2899,8 @@ P:	John McCutchan
 M:      john@johnmccutchan.com
 P:      Robert Love
 M:      rlove@rlove.org
+P:      Eric Paris
+M:      eparis@parisplace.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      Documentation/filesystems/inotify.txt
@@ -3366,6 +3405,16 @@ F:	drivers/serial/kgdboc.c
 F:      include/linux/kgdb.h
 F:      kernel/kgdb.c
 
+KMEMLEAK
+P:      Catalin Marinas
+M:      catalin.marinas@arm.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      Documentation/kmemleak.txt
+F:      include/linux/kmemleak.h
+F:      mm/kmemleak.c
+F:      mm/kmemleak-test.c
+
 KMEMTRACE
 P:      Eduard - Gabriel Munteanu
 M:      eduard.munteanu@linux360.ro
@@ -4152,6 +4201,69 @@ S:	Maintained
 F:      drivers/video/riva/
 F:      drivers/video/nvidia/
 
+OMAP SUPPORT
+P:      Tony Lindgren <tony@atomide.com>
+M:      tony@atomide.com
+L:      linux-omap@vger.kernel.org
+W:      http://www.muru.com/linux/omap/
+W:      http://linux.omap.com/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
+S:      Maintained
+F:      arch/arm/*omap*
+
+OMAP CLOCK FRAMEWORK SUPPORT
+P:      Paul Walmsley
+M:      paul@pwsan.com
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      arch/arm/*omap*/*clock*
+
+OMAP POWER MANAGEMENT SUPPORT
+P:      Kevin Hilman
+M:      khilman@deeprootsystems.com
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      arch/arm/*omap*/*pm*
+
+OMAP AUDIO SUPPORT
+P:      Jarkko Nikula
+M:      jhnikula@gmail.com
+L:      alsa-devel@alsa-project.org (subscribers-only)
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      sound/soc/omap/
+
+OMAP FRAMEBUFFER SUPPORT
+P:      Imre Deak
+M:      imre.deak@nokia.com
+L:      linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      drivers/video/omap/
+
+OMAP MMC SUPPORT
+P:      Jarkko Lavinen
+M:      jarkko.lavinen@nokia.com
+L:      linux-kernel@vger.kernel.org
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      drivers/mmc/host/*omap*
+
+OMAP RANDOM NUMBER GENERATOR SUPPORT
+P:      Deepak Saxena
+M:      dsaxena@plexity.net
+S:      Maintained
+F:      drivers/char/hw_random/omap-rng.c
+
+OMAP USB SUPPORT
+P:      Felipe Balbi
+M:      felipe.balbi@nokia.com
+P:      David Brownell
+M:      dbrownell@users.sourceforge.net
+L:      linux-usb@vger.kernel.org
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+
 OMFS FILESYSTEM
 P:      Bob Copeland
 M:      me@bobcopeland.com
@@ -4408,6 +4520,16 @@ S:	Maintained
 F:      include/linux/delayacct.h
 F:      kernel/delayacct.c
 
+PERFORMANCE COUNTER SUBSYSTEM
+P:      Peter Zijlstra
+M:      a.p.zijlstra@chello.nl
+P:      Paul Mackerras
+M:      paulus@samba.org
+P:      Ingo Molnar
+M:      mingo@elte.hu
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 PERSONALITY HANDLING
 P:      Christoph Hellwig
 M:      hch@infradead.org
@@ -4580,7 +4702,7 @@ F:	drivers/media/video/pvrusb2/
 
 PXA2xx/PXA3xx SUPPORT
 P:      Eric Miao
-M:      eric.miao@marvell.com
+M:      eric.y.miao@gmail.com
 P:      Russell King
 M:      linux@arm.linux.org.uk
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@ -4590,23 +4712,24 @@ F:	drivers/pcmcia/pxa2xx*
 F:      drivers/spi/pxa2xx*
 F:      drivers/usb/gadget/pxa2*
 F:      include/sound/pxa2xx-lib.h
-F:      sound/soc/pxa/pxa2xx*
+F:      sound/arm/pxa*
+F:      sound/soc/pxa
 
 PXA168 SUPPORT
 P:      Eric Miao
-M:      eric.miao@marvell.com
+M:      eric.y.miao@gmail.com
 P:      Jason Chagas
 M:      jason.chagas@marvell.com
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:      Supported
+S:      Maintained
 
 PXA910 SUPPORT
 P:      Eric Miao
-M:      eric.miao@marvell.com
+M:      eric.y.miao@gmail.com
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:      Supported
+S:      Maintained
 
 PXA MMCI DRIVER
 S:      Orphan
@@ -5127,7 +5250,6 @@ P:	Vincent Sanders
 M:      support@simtec.co.uk
 W:      http://www.simtec.co.uk/products/EB110ATX/
 S:      Supported
-F:      arch/arm/mach-ebsa110/
 
 SIMTEC EB2410ITX (BAST)
 P:      Ben Dooks
@@ -5318,11 +5440,12 @@ P:	Liam Girdwood
 M:      lrg@slimlogic.co.uk
 P:      Mark Brown
 M:      broonie@opensource.wolfsonmicro.com
-T:      git git://opensource.wolfsonmicro.com/linux-2.6-asoc
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 L:      alsa-devel@alsa-project.org (subscribers-only)
 W:      http://alsa-project.org/main/index.php/ASoC
 S:      Supported
 F:      sound/soc/
+F:      include/sound/soc*
 
 SPARC + UltraSPARC (sparc/sparc64)
 P:      David S. Miller
@@ -5540,20 +5663,6 @@ F:	drivers/misc/tifm*
 F:      drivers/mmc/host/tifm_sd.c
 F:      include/linux/tifm.h
 
-TI OMAP MMC INTERFACE DRIVER
-P:      Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:      linux-omap@vger.kernel.org
-W:      http://linux.omap.com
-W:      http://www.muru.com/linux/omap/
-S:      Maintained
-F:      drivers/mmc/host/omap.c
-
-TI OMAP RANDOM NUMBER GENERATOR SUPPORT
-P:      Deepak Saxena
-M:      dsaxena@plexity.net
-S:      Maintained
-F:      drivers/char/hw_random/omap-rng.c
-
 TIPC NETWORK LAYER
 P:      Per Liden
 M:      per.liden@ericsson.com
@@ -5612,6 +5721,14 @@ M:	ian@mnementh.co.uk
 S:      Maintained
 F:      drivers/mmc/host/tmio_mmc.*
 
+TMPFS (SHMEM FILESYSTEM)
+P:      Hugh Dickins
+M:      hugh.dickins@tiscali.co.uk
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      include/linux/shmem_fs.h
+F:      mm/shmem.c
+
 TPM DEVICE DRIVER
 P:      Debora Velarde
 M:      debora@linux.vnet.ibm.com
@@ -5637,6 +5754,7 @@ P:	Alan Cox
 M:      alan@lxorguk.ukuu.org.uk
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
+T:      stgit http://zeniv.linux.org.uk/~alan/ttydev/
 
 TULIP NETWORK DRIVERS
 P:      Grant Grundler