From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Apr 2017 06:35:14 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v4.11-rc7~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe251c4b9a272af45983ebc7dd538789e78fcf2e;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - revert of a commit that switched all Synaptics touchpads over to be
   driven by hid-rmi. It turns out that this caused several user-visible
   regressions, and therefore we revert back to the original state
   before all the reported issues have been fixed.

 - a new uclogic device ID addition, from Xiaolei Yu.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  Revert "HID: rmi: Handle all Synaptics touchpads using hid-rmi"
  HID: uclogic: add support for Ugee Tablet EX07S
---

fe251c4b9a272af45983ebc7dd538789e78fcf2e