]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'spi-mb/spi-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 02:35:51 +0000 (13:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 02:35:51 +0000 (13:35 +1100)
1  2 
drivers/spi/spi.c

Simple merge