]> 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>
Wed, 19 Sep 2012 03:06:17 +0000 (13:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 03:06:17 +0000 (13:06 +1000)
commitac125e01efe138964b5d16b72403e3b11de484a2
treecdfa3cce7ec0819fbeda3765ebda15286e27dc3d
parentc609183cbf062246c93c3081af0a2f22cf817dd4
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