]> 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>
Tue, 30 Oct 2012 02:30:27 +0000 (13:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 02:30:27 +0000 (13:30 +1100)
1  2 
drivers/spi/spi-s3c64xx.c

Simple merge