]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 03:32:30 +0000 (14:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 03:32:30 +0000 (14:32 +1100)
commit0ab4e7e0e6fde8a46ef23aa2c210740867b51bb7
treebe94f4fb9b42085e010e540e8128f481ab070d6d
parent58762329f659f29a44d991c9cb5e00cb1080873b
parentd517455aa4f99c4676b1e23b59e228dc558c6c47
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/omap_hsmmc.c