]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 02:24:21 +0000 (13:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 02:24:21 +0000 (13:24 +1100)
1  2 
drivers/input/touchscreen/zforce_ts.c

Simple merge