summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-lenovo.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-06-22 16:23:43 +0200
committerJiri Kosina <jkosina@suse.cz>2015-06-22 16:23:43 +0200
commitec3b34e1975670e68be3abff76f56dbb41dd417c (patch)
tree949f0bb7a3eb9a1f06bb92852b334f17397e4667 /drivers/hid/hid-lenovo.c
parentMerge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logi... (diff)
parentHID: i2c-hid: Do not set the ACPI companion field in the HID device (diff)
parentHID: lenovo: add support for Lenovo ThinkPad Keyboard Pro unit (diff)
parentHID: plantronics: Update to map volume up/down controls (diff)
parentHID: rmi: Disable populating F30 when the touchpad has physical buttons (diff)
parentHID: MAINTAINERS: Add HID SENSOR HUB drivers (diff)
parentHID: sjoy: support Super Joy Box 4 (diff)
parentHID: hid-sony: Fix report descriptor for Navigation Controller (diff)
parentHID: wacom: Introduce new 'touch_input' device (diff)
downloadlinux-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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 12:01:13 +0100