Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Apr 2017 19:26:10 +0000 (12:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Apr 2017 19:26:10 +0000 (12:26 -0700)
commit7f425895926af100cfdaebd504703325e5c08d3c
treecfbef1d9de05c8e94b15883db2d6e9ffac5c440d
parentdb5dc4996414d61162c9c83bf73e0e2bf2636911
parent6f107fab8f18228936cd3df88a3bb6050865c2c8
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:
 "Two last-minute regression fixes for Wacom driver from Jason Gerecke"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: Override incorrect logical maximum contact identifier
  HID: wacom: Treat HID_DG_TOOLSERIALNUMBER as unsigned