]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:27:24 +0000 (14:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:27:24 +0000 (14:27 +1000)
1  2 
drivers/input/keyboard/omap4-keypad.c
drivers/input/touchscreen/egalax_ts.c

Simple merge
Simple merge