tree 50aaa2c8ead4d7a4e04d9b6d4b3c5738d11b5df3
parent beaec533fc2701a28a4d667f67c9f59c6e4e0d13
parent 929b60a85b731d803f2b7829149496479eba0b20
author Linus Torvalds <torvalds@linux-foundation.org> 1500570894 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1500570894 -0700

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

Pull HID fixes from Jiri Kosina:

 - HID multitouch 4.12 regression fix from Dmitry Torokhov

 - error handling fix for HID++ driver from Gustavo A. R. Silva

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-logitech-hidpp: add NULL check on devm_kmemdup() return value
  HID: multitouch: do not blindly set EV_KEY or EV_ABS bits