summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-01-22 15:40:14 +0100
committerJiri Kosina <jkosina@suse.cz>2014-01-22 15:40:14 +0100
commit62813858fb5d1fb661433d7884668aa111115a35 (patch)
tree2ad585653cbbd2a8776a6634733193819ea4b9fa /drivers/hid/hid-ids.h
parentHID: microsoft: no fallthrough in MS ergonomy 0xff05 usage (diff)
parentHID: i2c-hid: disable interrupt on suspend (diff)
parentHID: hid-sensor-hub: Fix buggy report descriptors (diff)
parentHID: sony: Use colors for the Dualshock 4 LED names (diff)
parentHID: hid-holtek-mouse: add new a070 mouse (diff)
downloadlinux-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