]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2017 21:05:15 +0000 (13:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2017 21:05:15 +0000 (13:05 -0800)
commit0f10d78947711c9a07f8885617cc31587ad0b48a
tree76dbb4da02aea1ba8bd886b7b2c53fdb26202710
parentf415e248b16350d77f873e00f36cbdc32da1a53d
parentabb5243707f52e8b1e4f1ed2371263c101a1076e
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - regression fix (sleeping while atomic) for cp2112, from Johan Hovold

 - regression fix for proximity handling under certain circumstances in
   Wacom driver, from Jason Gerecke

 - functional fix for Logitech Rumblepad 2, from Ardinartsev Nikita

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: cp2112: fix gpio-callback error handling
  HID: cp2112: fix sleep-while-atomic
  HID: hid-lg: Fix immediate disconnection of Logitech Rumblepad 2
  HID: usbhid: Quirk a AMI virtual mouse and keyboard with ALWAYS_POLL
  HID: wacom: Fix poor prox handling in 'wacom_pl_irq'