]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi-mb/spi-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 04:44:07 +0000 (14:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 04:44:07 +0000 (14:44 +1000)
commitc239cc8236ca5b9815750ed9592ca0db9ad37f45
tree640f9b8a153494be032e9dbbcac4a189e2328bfb
parent4d6a6ef1f347035444837d4ba3d1c5a38b2e044f
parent337ef8d0a2ea93865537a2ada942cbab5699f2a1
Merge remote-tracking branch 'spi-mb/spi-next'

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