Merge branch 'v3.2-rc6' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 23:41:33 +0000 (23:41 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 23:41:33 +0000 (23:41 +0000)
commit4551ae0a24bba06972247a80f721fc21f6b2b758
tree7e17b819ba34f73988d384161335ebe5729897ad
parente2c236f0a42fbb9e6a9528f8436f348218ffee96
parent384703b8e6cd4c8ef08512e596024e028c91c339
Merge branch 'v3.2-rc6' into next/drivers
arch/arm/Kconfig
drivers/mmc/host/omap_hsmmc.c