projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79f4d1d 2fa299a)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Feb 2017 01:28:25 +0000 (17:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Feb 2017 01:28:25 +0000 (17:28 -0800)
Pull HID fix from Jiri Kosina:
 "Regression fix for HID_RMI-driven synaptics touchpads in
  !CONFIG_HID_RMI cases"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: rmi: fallback to generic/multitouch if hid-rmi is not built


Trivial merge
John Crispins staging tree