]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:05:14 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:05:14 +0000 (12:05 +1100)
commita8ec749d77232ed6f41315418519742ffc7eaf57
tree870b340ad7915601f70dafc34eed4d87e75e9e47
parent7d66f7b9400ba169c94ddc15ef0d25547caccc46
parenta1487fb359d3ef4cd509dc53ba3784b124cde547
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/omap.c
MAINTAINERS
drivers/mmc/host/atmel-mci.c
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/pxamci.c
drivers/mmc/host/sdhci-pci.c
drivers/mmc/host/sdhci-tegra.c
drivers/mmc/host/vub300.c