From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 May 2013 20:50:03 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v4.0~4002
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c0eec03b188efafba3a35315b59a9efbf9684fc;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-linus' of git://git./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
---

4c0eec03b188efafba3a35315b59a9efbf9684fc