]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:00:16 +0000 (12:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:00:16 +0000 (12:00 +1000)
commit80b30632cc95446b97b31544a8e205d152a670ce
tree26ce0c7e05cabe8e8063293743ad1eca51436333
parent61722c9d6167e46e5c6acd55fad4b45c04289712
parent2668b40fe084330b311672c4e89b73e90d80527e
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/mmc/host/dw_mmc.c
drivers/mmc/host/sdhci-esdhc-imx.c