]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 01:59:18 +0000 (11:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 01:59:18 +0000 (11:59 +1000)
1  2 
drivers/input/input.c
drivers/input/misc/uinput.c

Simple merge
Simple merge