diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:22:06 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:22:06 +0200 |
| commit | 817a3125819983956bb8a22455a569aac4e8ea34 (patch) | |
| tree | 745a6efbce4a42f33abf2979fff8e6be6a9f6e86 /drivers/hid | |
| parent | HID: usbhid: add Chicony/Pixart usb optical mouse that needs QUIRK_ALWAYS_POLL (diff) | |
| parent | HID: cypress: use swap() in cp_report_fixup() (diff) | |
| parent | HID: hidpp: Add driver for mouse logitech M560 (diff) | |
| download | linux-817a3125819983956bb8a22455a569aac4e8ea34.tar.xz linux-817a3125819983956bb8a22455a569aac4e8ea34.zip | |
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus
Conflicts:
drivers/hid/hid-logitech-hidpp.c