]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:21:59 +0000 (12:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:21:59 +0000 (12:21 +1100)
1  2 
arch/arm/mach-pxa/raumfeld.c
drivers/input/touchscreen/Kconfig

Simple merge
Simple merge