]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:28:02 +0000 (10:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:28:02 +0000 (10:28 +1000)
1  2 
drivers/input/misc/Kconfig
drivers/input/misc/Makefile

Simple merge
Simple merge