summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-06-03 22:23:52 +0200
committerJiri Kosina <jkosina@suse.cz>2020-06-03 22:23:52 +0200
commit16ba7e312045cd5d32fba0156312b4303f200787 (patch)
tree05b0cf1cae38df6d844d8e24f62c6acd274471b6 /drivers/hid/hid-ids.h
parente72455b898ac678667c5674668186b4670d87d11 (diff)
parent346338ef00d35bf8338ded171f9abeb9b10b43df (diff)
parentc4f0126d487f3c68ab19ccb7c561e8fbf3ea2247 (diff)
parent16863fbc1cf2618f5d35b37cb23119d09b8cc3b2 (diff)
parent0b66fb3e6b7a53688f8e20945ac78cd3d832c65f (diff)
parentc08ce255033a31440219b7d3dffedf37057f2444 (diff)
parent328de1c519c5c0925151cae47944a1c1a0333bcd (diff)
parent27a6f70173ac996d891e622c69730bd6c1f82a5e (diff)
Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus