]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:05:39 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:05:39 +0000 (12:05 +1100)
1  2 
drivers/input/tablet/wacom_wac.c

Simple merge