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)
1  2 
arch/arm/Kconfig
drivers/mmc/host/omap_hsmmc.c

Simple merge
Simple merge