Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
  MAINTAINERS: EB110ATX is not ebsa110
  MAINTAINERS: update Eric Miao's email address and status
  fb: add support of LCD display controller on pxa168/910 (base layer)
  [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
  [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
  [ARM] 5544/1: Trust PrimeCell resource sizes
  [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
  [ARM] pxa/sharpsl_pm: drop set_irq_type calls
  [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
  [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
  [ARM] sa1100: remove unused collie_pm.c
  [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
  [ARM] 5550/1: Add default configure file for w90p910 platform
  [ARM] 5549/1: Add clock api for w90p910 platform.
  [ARM] 5548/1: Add gpio api for w90p910 platform
  [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
  [ARM] Make ARM_VIC_NR depend on ARM_VIC
  [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
  ARM: OMAP4: SMP: Update defconfig for OMAP4430
  ARM: OMAP4: SMP: Enable SMP support for OMAP4430
  ...

1 files changed, 75 insertions, 20 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 90f81283b722..0765bb6aa3cb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -681,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
@@ -4159,6 +4166,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
@@ -4597,7 +4667,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)
@@ -4612,19 +4682,19 @@ 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
@@ -5145,7 +5215,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
@@ -5559,20 +5628,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