]> 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, 10 Sep 2012 03:47:59 +0000 (13:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 03:47:59 +0000 (13:47 +1000)
commita7721bd8f0b6c3abb240bb85b62f0b82deab39d4
tree9000653e9e349c8546c13c126d3831bd546312f8
parent85b4cc3f6a1f6d64f751f5c012828f519dab7f3a
parent4ef5eb4a861c414c3bd18e7272a600dce37ba54e
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