tree 6ec0c307d6c73ef158246863f1b8b5b45000b59a
parent 9cbbef4efb7cfb6962da57c9e17f5ce4280c14ca
parent a80e803a2ae4efa5efbcfa97dcbbc48d15226cf9
author Linus Torvalds <torvalds@linux-foundation.org> 1466227632 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1466227632 -1000

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

Pull HID subsystem fixes from Jiri Kosina:

 - kernel panic fix in hid-elo from Oliver Neukum

 - Surface Pro 3 device quirk from Benjamin Tissoires

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: multitouch: Add MT_QUIRK_NOT_SEEN_MEANS_UP to Surface Pro 3
  HID: elo: kill not flush the work