]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:58:46 +0000 (13:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:58:46 +0000 (13:58 +1100)
commit128c6d290240414c26b6ed2e8d175b30fc8156e7
tree36b21a294bc6be2ae8e908506833cbb768b7807c
parentbe75ae5d50a9a7b3b0d79794cc22924527cade71
parentc358702ed0f27bad03c6f6f545abe23f966ad53e
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