]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 03:17:00 +0000 (14:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 03:17:00 +0000 (14:17 +1100)
commit441ed680b88b14ede5a4d7872c5d69e7779e6840
tree0732b794e9a67c38fbfe9cc876cbab770ddd3e66
parentdf54ff347e4c03f1860b965f5fda13e8e1bb28b3
parentd6fa5d7c08a87d84bcb1abb565287253fe992820
Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/spi/spi-mpc512x-psc.c
drivers/spi/Kconfig
drivers/spi/spi-mpc512x-psc.c
drivers/spi/spi-tegra114.c
drivers/spi/spi-tegra20-sflash.c
drivers/spi/spi-tegra20-slink.c