]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:16:02 +0000 (12:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:16:02 +0000 (12:16 +1000)
1  2 
drivers/spi/Kconfig

Simple merge