]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi-mb/spi-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 04:15:15 +0000 (14:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 04:15:15 +0000 (14:15 +1000)
commita580053af575ef7cda97d094031e10add0fea9fd
tree771271be712dfe7a001db730327efc6adb1924e2
parent5bf46771f501d2efd2a2f99d75956aa5e69d8a30
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