]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 May 2012 23:53:32 +0000 (09:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 May 2012 23:53:32 +0000 (09:53 +1000)
1  2 
drivers/spi/Kconfig

Simple merge