]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi-mb/spi-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 03:48:18 +0000 (13:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 03:48:18 +0000 (13:48 +1000)
commitf5163d688609008e4d875b8fdf8e3f0b6fcda2ef
treed62af32461689e65b8293bf4f783b65c8ca6195c
parent4e35dfa6eee2f6d206d7426af1dfbeb5a419630b
parent337c422cf74b1ae46969395847795de953e66958
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