]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 00:14:00 +0000 (10:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 00:14:00 +0000 (10:14 +1000)
1  2 
include/uapi/linux/input.h

Simple merge