]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:47:51 +0000 (14:47 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:47:51 +0000 (14:47 +0100)
1  2 
drivers/input/keyboard/pxa27x_keypad.c
drivers/input/tablet/wacom_sys.c

Simple merge