diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:23:43 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:23:43 +0200 |
| commit | ec3b34e1975670e68be3abff76f56dbb41dd417c (patch) | |
| tree | 949f0bb7a3eb9a1f06bb92852b334f17397e4667 /drivers/hid/usbhid | |
| parent | Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logi... (diff) | |
| parent | HID: i2c-hid: Do not set the ACPI companion field in the HID device (diff) | |
| parent | HID: lenovo: add support for Lenovo ThinkPad Keyboard Pro unit (diff) | |
| parent | HID: plantronics: Update to map volume up/down controls (diff) | |
| parent | HID: rmi: Disable populating F30 when the touchpad has physical buttons (diff) | |
| parent | HID: MAINTAINERS: Add HID SENSOR HUB drivers (diff) | |
| parent | HID: sjoy: support Super Joy Box 4 (diff) | |
| parent | HID: hid-sony: Fix report descriptor for Navigation Controller (diff) | |
| parent | HID: wacom: Introduce new 'touch_input' device (diff) | |
| download | linux-ec3b34e1975670e68be3abff76f56dbb41dd417c.tar.xz linux-ec3b34e1975670e68be3abff76f56dbb41dd417c.zip | |
Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus
Conflicts:
drivers/hid/wacom_wac.c