]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 May 2014 01:17:28 +0000 (11:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 May 2014 01:17:28 +0000 (11:17 +1000)
1  2 
include/uapi/linux/input.h

Simple merge