]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:49:00 +0000 (12:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:49:00 +0000 (12:49 +1100)
1  2 
drivers/input/keyboard/Kconfig

Simple merge