summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-23 13:50:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-23 13:50:03 -0700
commit4c0eec03b188efafba3a35315b59a9efbf9684fc (patch)
tree2988d0fea430a107a8ccea6174826f98dcf237cf /include/linux
parentd97955625710b57f24427e403f150126078273c2 (diff)
parentc73a1afbe6dce11b6e249d0eee69b90dc24daa88 (diff)
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 'include/linux')
0 files changed, 0 insertions, 0 deletions