]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:47:37 +0000 (13:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:47:37 +0000 (13:47 +1100)
commit214c3f1d6daccabf879e9e7688078dcc489f57ae
tree30a2b73ee6436953e84a1930d3e5fa5aeb108ce3
parentf4580a5ac044e82b034eb864e09e5cc071d886fa
parent85136b74dc7fbbcaf173b660406de8aa1dd0068a
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
MAINTAINERS
MAINTAINERS
drivers/mmc/host/Kconfig