Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
Arnd Bergmann [Thu, 15 Mar 2012 16:09:17 +0000 (16:09 +0000)]
* 'board-specific' of git://github.com/hzhuang1/linux:
  pxa/hx4700: Remove pcmcia platform_device structure
  ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
  ARM: pxa/hx4700: Remove unwanted request for GPIO105

(update to 3.3-rc7)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1  2 
arch/arm/Kconfig
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-pxa/hx4700.c
drivers/mmc/host/mmci.c

Simple merge
Simple merge
Simple merge