]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 18 Dec 2011 23:38:53 +0000 (10:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 18 Dec 2011 23:38:53 +0000 (10:38 +1100)
1  2 
drivers/input/misc/cma3000_d0x.c

Simple merge