Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:17:12 +0000 (12:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:17:12 +0000 (12:17 +1100)
1  2 
drivers/input/touchscreen/Kconfig

Simple merge