diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-21 12:06:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-21 12:06:29 -0700 |
commit | db1b5ccd27a37840af5c868f82f36d5d33430b96 (patch) | |
tree | 9786f8daca20b9c5987885da9030b049a7446427 /drivers/hid/hid-retrode.c | |
parent | dcba71086e0d1abf4f00cd381530b11d0db7fa1d (diff) | |
parent | 900a88ef348803cd2ad2aeb13ffe06e807c6ce65 (diff) |
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
Diffstat (limited to 'drivers/hid/hid-retrode.c')
0 files changed, 0 insertions, 0 deletions