]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge commit 'refs/next/20120905/spi-mb'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:47:28 +0000 (13:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:47:28 +0000 (13:47 +1000)
commit3bf3e1713e5ef117bf4ce7c844c6ef03f02252cb
tree55184047e62f71ec0740c8e9001bed1fb238d395
parenta95481e4cc14ee7e3ddec8c0b78730642be25e96
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