]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: beaec53 929b60a)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jul 2017 17:14:54 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jul 2017 17:14:54 +0000 (10:14 -0700)
commitc6efb4548d0a665b791b3db0de7accd63d630f1d
tree50aaa2c8ead4d7a4e04d9b6d4b3c5738d11b5df3tree | snapshot
parentbeaec533fc2701a28a4d667f67c9f59c6e4e0d13commit | diff
parent929b60a85b731d803f2b7829149496479eba0b20commit | diff
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
Linux kernel for KaRo TX COM modules