]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'input/next'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:29:24 +0000 (13:29 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:29:24 +0000 (13:29 +0200)
1  2 
drivers/input/keyboard/pxa27x_keypad.c
drivers/input/tablet/wacom_sys.c

Simple merge