]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:16:48 +0000 (12:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:16:48 +0000 (12:16 +1100)
commit41b7c2a15da4a918b6ae5f0be94dd860538dc363
tree71321581450510bd23a07190bc9fcc46c4b70137
parenta79c62355db383d74a3889c699a1c4d9105577cd
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