]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 01:27:31 +0000 (12:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 01:27:31 +0000 (12:27 +1100)
1  2 
drivers/i2c/busses/Kconfig

Simple merge