]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc15f7f9fd728fb1949a513cc8ea24d9fa49546ad
tree9786f8daca20b9c5987885da9030b049a7446427
parent7a719529a67f447ced36333f0ea90150a5b5d3c4
parent7d59fea078ff44555cbaf1af4644e00cf986d8e0
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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