]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
projects / ~emulex / infiniband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c77ef89 63ecf0a)
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)
* '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 patch | diff1 | diff2 | blob | history
arch/arm/mach-exynos/mach-universal_c210.c patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/hx4700.c patch | diff1 | diff2 | blob | history
drivers/mmc/host/mmci.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-pxa/hx4700.c
Simple merge
diff --cc drivers/mmc/host/mmci.c
Simple merge
Emulex OneConnect RDMA Driver