diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-01-22 15:40:14 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-01-22 15:40:14 +0100 |
commit | 62813858fb5d1fb661433d7884668aa111115a35 (patch) | |
tree | 2ad585653cbbd2a8776a6634733193819ea4b9fa /drivers/hid/Kconfig | |
parent | HID: microsoft: no fallthrough in MS ergonomy 0xff05 usage (diff) | |
parent | HID: i2c-hid: disable interrupt on suspend (diff) | |
parent | HID: hid-sensor-hub: Fix buggy report descriptors (diff) | |
parent | HID: sony: Use colors for the Dualshock 4 LED names (diff) | |
parent | HID: hid-holtek-mouse: add new a070 mouse (diff) | |
download | linux-62813858fb5d1fb661433d7884668aa111115a35.tar.xz linux-62813858fb5d1fb661433d7884668aa111115a35.zip |
Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus