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

Simple merge
Simple merge