projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dcba710 900a88e)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Jun 2017 19:06:29 +0000 (12:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Jun 2017 19:06:29 +0000 (12:06 -0700)
commitdb1b5ccd27a37840af5c868f82f36d5d33430b96
tree9786f8daca20b9c5987885da9030b049a7446427tree | snapshot
parentdcba71086e0d1abf4f00cd381530b11d0db7fa1dcommit | diff
parent900a88ef348803cd2ad2aeb13ffe06e807c6ce65commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - revert of a commit to magicmouse driver that regressess certain
   devices, from Daniel Stone

 - quirk for a specific Dell mouse, from Sebastian Parschauer

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  Revert "HID: magicmouse: Set multi-touch keybits for Magic Mouse"
  HID: Add quirk for Dell PIXART OEM mouse
Domain: System / Kernel;