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 /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching (diff) | |
| parent | Merge branch 'for-4.12/upstream-fixes' into for-linus (diff) | |
| download | linux-dev-db1b5ccd27a37840af5c868f82f36d5d33430b96.tar.xz linux-dev-db1b5ccd27a37840af5c868f82f36d5d33430b96.zip | |
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 'include')
0 files changed, 0 insertions, 0 deletions