diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-23 22:50:03 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-23 22:50:03 +0200 |
commit | 4c0eec03b188efafba3a35315b59a9efbf9684fc (patch) | |
tree | 2988d0fea430a107a8ccea6174826f98dcf237cf /drivers/acpi | |
parent | Merge tag 'tty-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
parent | Input: wacom - add an eraser to DTH2242/DTK2241 (diff) | |
download | linux-4c0eec03b188efafba3a35315b59a9efbf9684fc.tar.xz linux-4c0eec03b188efafba3a35315b59a9efbf9684fc.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"A few fixups to Wacom and eGalax touchscreen driver"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - add an eraser to DTH2242/DTK2241
Input: wacom - add a few new styli for Cintiq series
Input: wacom - add three new display tablets
Input: egalax_ts - ABS_MT_POSITION_Y not reported well
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions