summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-04-01 19:06:50 +0200
committerJiri Kosina <jkosina@suse.cz>2014-04-01 19:06:50 +0200
commitfa1054a29b21e4c932b5c93def600149451cec32 (patch)
tree88ada194d3004c02dcef9fef15c6609275284368 /drivers/hid/hid-ids.h
parentMerge branch 'for-3.15/microsoft' into for-linus (diff)
parentHID: multitouch: add support for Win 8.1 multitouch touchpads (diff)
parentMerge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-3.15/sony (diff)
parentHID: uhid: Add UHID_CREATE2 + UHID_INPUT2 (diff)
downloadlinux-fa1054a29b21e4c932b5c93def600149451cec32.tar.xz
linux-fa1054a29b21e4c932b5c93def600149451cec32.zip
Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for-linus