]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 14 Oct 2012 23:41:00 +0000 (10:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 14 Oct 2012 23:41:00 +0000 (10:41 +1100)
1  2 
drivers/input/touchscreen/wm831x-ts.c

Simple merge