• Linus Torvalds's avatar
    Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 2cf4d451
    Linus Torvalds authored
    * '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
      ...
    2cf4d451
imx.c 36 KB