]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 01:34:02 +0000 (12:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 01:34:02 +0000 (12:34 +1100)
1  2 
drivers/input/touchscreen/edt-ft5x06.c
drivers/input/touchscreen/wm831x-ts.c

Simple merge