| commit | 4c0eec03b188efafba3a35315b59a9efbf9684fc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 23 13:50:03 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 23 13:50:03 2013 -0700 |
| tree | 2988d0fea430a107a8ccea6174826f98dcf237cf | |
| parent | d97955625710b57f24427e403f150126078273c2 [diff] | |
| parent | c73a1afbe6dce11b6e249d0eee69b90dc24daa88 [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