From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Jun 2017 19:06:29 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=db1b5ccd27a37840af5c868f82f36d5d33430b96;p=openwrt%2Fstaging%2Fblogic.git

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
---

db1b5ccd27a37840af5c868f82f36d5d33430b96