Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Apr 2017 06:35:14 +0000 (23:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Apr 2017 06:35:14 +0000 (23:35 -0700)
commitfe251c4b9a272af45983ebc7dd538789e78fcf2e
tree7a685d3c139bee7f23f9084d77424229947698e3
parentc08e611b7d0169b513e3b4515ffd51ac7f37f22c
parent84379d83d8e536aef2c706744ff22c136d0be6c9
Merge branch 'for-linus' of git://git./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