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
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-mx2/clock_imx21.c
Simple merge

diff --cc arch/arm/mach-mx3/clock-imx35.c
Simple merge

diff --cc arch/arm/mach-mx3/clock.c
Simple merge

diff --cc arch/arm/mach-pxa/devices.c
Simple merge

diff --cc arch/arm/mach-pxa/imote2.c
Simple merge

diff --cc arch/arm/mm/proc-v7.S
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/imx-uart.h
index f9bd17dd8dd71af1fd6d6c05f7c7781b51daea26,90af4d9bc19e9b79ec8e19b362cf7b525676313c..4adec9b154dd6b91904aad2f542aef1730c22f72
--- 1/arch/arm/plat-mxc/include/mach/imx-uart.h
--- 2/arch/arm/plat-mxc/include/mach/imx-uart.h
+++ b/arch/arm/plat-mxc/include/mach/imx-uart.h
@@@ -24,12 -23,8 +24,12 @@@
  
  struct imxuart_platform_data {
        int (*init)(struct platform_device *pdev);
-       int (*exit)(struct platform_device *pdev);
+       void (*exit)(struct platform_device *pdev);
        unsigned int flags;
 +      void (*irda_enable)(int enable);
 +      unsigned int irda_inv_rx:1;
 +      unsigned int irda_inv_tx:1;
 +      unsigned short transceiver_delay;
  };
  
  #endif

diff --cc drivers/char/hw_random/Kconfig
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge

diff --cc drivers/serial/imx.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc include/linux/amba/serial.h
Simple merge

diff --cc sound/soc/pxa/Kconfig
index dcd163a4ee9ac02283ed1ff397822249f96c5e0d,96b2699abf61a4f5a3f5fdbe2590a4e4b8a91e6e..6375b4ea525dc572ca4feae6a8b69db703ecce1a
--- 1/sound/soc/pxa/Kconfig
--- 2/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@@ -95,11 -95,12 +95,12 @@@ config SND_PXA2XX_SOC_EM_X27
        select SND_SOC_WM9712
        help
          Say Y if you want to add support for SoC audio on
 -        CompuLab EM-x270.
 +        CompuLab EM-x270, eXeda and CM-X300 machines.
  
  config SND_PXA2XX_SOC_PALM27X
-       bool "SoC Audio support for Palm T|X, T5 and LifeDrive"
-       depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || MACH_PALMT5)
+       bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive"
+       depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \
+                       MACH_PALMT5 || MACH_PALMTE2)
        select SND_PXA2XX_SOC_AC97
        select SND_SOC_WM9712
        help

diff --cc sound/soc/s3c24xx/s3c2412-i2s.c
Simple merge