Merge commit 'upstream/master'

1 files changed, 56 insertions, 34 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 93fd6b2efeee..03c5d6ccb9f8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -441,10 +441,7 @@ M:	spyro@f2s.com
 S:      Maintained
 
 ARM PRIMECELL MMCI PL180/1 DRIVER
-P:      Russell King
-M:      rmk@arm.linux.org.uk
-L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-S:      Maintained
+S:      Orphan
 
 ARM/ADI ROADRUNNER MACHINE SUPPORT
 P:      Lennert Buytenhek
@@ -483,11 +480,28 @@ M:	kernel@wantstofly.org
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
+ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+P:      Mike Rapoport
+M:      mike@compulab.co.il
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/CORGI MACHINE SUPPORT
 P:      Richard Purdie
 M:      rpurdie@rpsys.net
 S:      Maintained
 
+ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
+P:      Daniel Ribeiro
+M:      drwyrm@gmail.com
+P:      Stefan Schmidt
+M:      stefan@openezx.org
+P:      Harald Welte
+M:      laforge@openezx.org
+L:      openezx-devel@lists.openezx.org (subscribers-only)
+W:      http://www.openezx.org/
+S:      Maintained
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 P:      Lennert Buytenhek
 M:      kernel@wantstofly.org
@@ -575,10 +589,18 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
 ARM/TOSA MACHINE SUPPORT
+P:      Dmitry Baryshkov
+M:      dbaryshkov@gmail.com
 P:      Dirk Opfer
 M:      dirk@opfer-online.de
 S:      Maintained
 
+ARM/PALMTX SUPPORT
+P:      Marek Vasut
+M:      marek.vasut@gmail.com
+W:      http://hackndev.com
+S:      Maintained
+
 ARM/PLEB SUPPORT
 P:      Peter Chubb
 M:      pleb@gelato.unsw.edu.au
@@ -1021,6 +1043,12 @@ M:	fujita.tomonori@lab.ntt.co.jp
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 
+BT8XXGPIO DRIVER
+P:      Michael Buesch
+M:      mb@bu3sch.de
+W:      http://bu3sch.de/btgpio.php
+S:      Maintained
+
 BTTV VIDEO4LINUX DRIVER
 P:      Mauro Carvalho Chehab
 M:      mchehab@infradead.org
@@ -1962,7 +1990,7 @@ P:	Carlos Corbacho
 M:      carlos@strangeworlds.co.uk
 S:      Odd Fixes
 
-HPET:   High Precision Event Timers driver (hpet.c)
+HPET:   High Precision Event Timers driver (drivers/char/hpet.c)
 P:      Clemens Ladisch
 M:      clemens@ladisch.de
 S:      Maintained
@@ -1988,6 +2016,12 @@ M:	mikulas@artax.karlin.mff.cuni.cz
 W:      http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
 S:      Maintained
 
+HTCPEN TOUCHSCREEN DRIVER
+P:      Pau Oliva Fora
+M:      pof@eslack.org
+L:      linux-input@vger.kernel.org
+S:      Maintained
+
 HUGETLB FILESYSTEM
 P:      William Irwin
 M:      wli@holomorphy.com
@@ -2189,6 +2223,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
@@ -2725,12 +2761,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
@@ -2909,8 +2943,6 @@ P:	Faisal Latif
 M:      flatif@neteffect.com
 P:      Chien Tung
 M:      ctung@neteffect.com
-P:      Glenn Streiff
-M:      gstreiff@neteffect.com
 L:      general@lists.openfabrics.org
 W:      http://www.neteffect.com
 S:      Supported
@@ -3091,6 +3123,12 @@ W:	http://oss.oracle.com/projects/ocfs2/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
 S:      Supported
 
+OMFS FILESYSTEM
+P:      Bob Copeland
+M:      me@bobcopeland.com
+L:      linux-karma-devel@lists.sourceforge.net
+S:      Maintained
+
 OMNIKEY CARDMAN 4000 DRIVER
 P:      Harald Welte
 M:      laforge@gnumonks.org
@@ -3274,14 +3312,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
@@ -3535,7 +3565,7 @@ S:	Supported
 
 S390 NETWORK DRIVERS
 P:      Ursula Braun
-M:      ubraun@linux.vnet.ibm.com
+M:      ursula.braun@de.ibm.com
 P:      Frank Blaschka
 M:      blaschka@linux.vnet.ibm.com
 M:      linux390@de.ibm.com
@@ -3555,7 +3585,7 @@ S:	Supported
 
 S390 IUCV NETWORK LAYER
 P:      Ursula Braun
-M:      ubraun@linux.vnet.ibm.com
+M:      ursula.braun@de.ibm.com
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -4049,9 +4079,10 @@ W:	http://www.buzzard.org.uk/toshiba/
 S:      Maintained
 
 TPM DEVICE DRIVER
-P:     Debora Velarde
-P:     Rajiv Andrade
-M:      tpmdd-devel@lists.sourceforge.net
+P:      Debora Velarde
+M:      debora@linux.vnet.ibm.com
+P:      Rajiv Andrade
+M:      srajiv@linux.vnet.ibm.com
 W:      http://tpmdd.sourceforge.net
 P:      Marcel Selhorst
 M:      tpm@selhorst.net
@@ -4059,12 +4090,6 @@ W:	http://www.prosec.rub.de/tpm/
 L:      tpmdd-devel@lists.sourceforge.net
 S:      Maintained
 
-TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE
-P:      Muli Ben-Yehuda
-M:      mulix@mulix.org
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 TRIVIAL PATCHES
 P:      Jesper Juhl
 M:      trivial@kernel.org
@@ -4110,9 +4135,6 @@ 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