]> 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, 3 Aug 2011 03:14:40 +0000 (13:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 03:14:40 +0000 (13:14 +1000)
commitf83bcfcff3751d58dffa128cbf8ac3b93772f5fb
tree6ccb3ff19eb3368c02e91b2380f71037897dbb39
parenta108b5d8cd16ee272fd9fbee51637b5eacf30800
parent9259bee021004de89d7061e603633ad3261f7b54
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