]> 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>
Mon, 17 Sep 2012 06:15:16 +0000 (16:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 06:15:16 +0000 (16:15 +1000)
commitfa707de8e0925114e864f9c9fcc568bfa2553662
tree8192ca78de6c8b721872850b754955f5a8c7cee7
parentc59692b39cab124d4b05b6f47c646ece9c48f6c2
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