projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit81bbef23db51c0b450d90607fbbc2ad80ee0d43f
tree763e991b31dbf83ff53cf964e8b8c402069e3754tree | snapshot
parent79f4d1d5c0d7d115b5a693a5bb369e69efb7e7a5commit | diff
parent2fa299a917adb2db2d486b9e4a3072865ce70a03commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

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
John Crispins staging tree