]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 03:29:32 +0000 (13:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 03:29:32 +0000 (13:29 +1000)
1  2 
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/misc/ad714x-i2c.c
include/linux/input.h

Simple merge
Simple merge
Simple merge
Simple merge