]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge commit 'refs/next/20120905/spi-mb'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:58:39 +0000 (13:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:58:39 +0000 (13:58 +1000)
commit7e47161fbbb253ef4f9c6f4e94a0215eaec08639
treee4f747b99d4113b97b1b37c475d20b5659f5de4e
parentcd85ccccdbbfcf5d25507a8711acbf5237cb22ce
parent1d045dd2aa485a05712f134eecbdb70a77380f44
Merge commit 'refs/next/20120905/spi-mb'

Conflicts:
drivers/mmc/host/mxs-mmc.c
drivers/mmc/host/mxs-mmc.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/spi-s3c64xx.c
drivers/spi/spi-topcliff-pch.c