]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:35:55 +0000 (10:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:35:55 +0000 (10:35 +1000)
commit122056eac96d8b9d67af7d379659f1137f2cc283
tree2816ff3e668c5c43fcb0fa3cc123f13e657598ce
parent212f2ebecf18a839da0d4da98518aa78c13ab4f2
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