Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 16:09:17 +0000 (16:09 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 16:09:21 +0000 (16:09 +0000)
commit065319c229c76ded943a8a7cf55e1e6e1e55ae69
tree6b16c74b13eb2d8147aa346aa0dec247a8cd0a28
parentc77ef898625f558c89c6ca0b27e2032f0fad4196
parent63ecf0a9b55ada8c59ac10472c4468b46cf2e97a
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards

* '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>
arch/arm/Kconfig
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-pxa/hx4700.c
drivers/mmc/host/mmci.c