]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 5 Aug 2011 01:50:59 +0000 (11:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 5 Aug 2011 01:50:59 +0000 (11:50 +1000)
commitbb758817e86b9e65d80c4ec45904458c72cdd288
tree1cde502d6f67bcb796755411f259c8beb8c58a8d
parentad2b8dca587366911c7d8cb805f012c0c37e61ec
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