summary refs log tree commit diff
path: root/fs/jfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-25 08:49:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-25 08:49:00 -0700
commita9d0683e0b62b46c7a5d0ebd8f642d8f9a4b7b32 (patch)
tree27a59cfa771518cccd3bea1c32e956c768887e7e /fs/jfs
parenteeb7c41d9d7c0902accb1d481fe78d84d30c69cc (diff)
parentc228352dc67ea8fa5770c83e2d9c2fbafb3e700a (diff)
downloadlinux-a9d0683e0b62b46c7a5d0ebd8f642d8f9a4b7b32.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:

 - regression fix (missing IRQs) for devices that require 'always poll'
   quirk, from Dmitry Torokhov

 - new device ID addition to Ortek driver, from Benjamin Tissoires

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: ortek: add one more buggy device
  HID: usbhid: fix "always poll" quirk
Diffstat (limited to 'fs/jfs')
0 files changed, 0 insertions, 0 deletions