Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2019 18:16:05 +0000 (07:16 +1300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2019 18:16:05 +0000 (07:16 +1300)
commit787a3b4322763284a594a5dd3680508c0bfb20b0
treebb02ff6637a2bb8a3c7c128cbd24f40bfd847ebc
parent48b161983ae5266ffa42f0ccaf7224eaeda38e59
parent1950f462916edc9581168ca8d5882a8101e8bbcf
Merge branch 'for-linus' of git://git./linux/kernel/git/hid/hid

Pull HID fixes from Jiri Kosina:

 - descriptor parsing regression fix for devices that have more than 16
   collections, from Peter Hutterer (and followup cleanup from Philipp
   Zabel)

 - quirk for Goodix touchpad

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: core: simplify active collection tracking
  HID: i2c-hid: Disable runtime PM on Goodix touchpad
  HID: core: replace the collection tree pointers with indices