]> 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 Oct 2012 03:48:26 +0000 (13:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)
commit0edf22b4ece3535546458847ecc18649111f4b10
treeb43342ccc88d140d7c867ceaf34d55dcbe85bcbf
parent11d115953d8afc525a992b349f97905a6dac255e
parent0f59ede646d84d8bfc91bc8d3de2bc28aa89aba3
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-tegra.c
drivers/mmc/host/vub300.c