diff options
author | Jiri Kosina <jkosina@suse.cz> | 2016-10-07 09:59:48 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2016-10-07 09:59:48 +0200 |
commit | 179023e6af0c608ffb505821223f5580853ef6b8 (patch) | |
tree | ff80cabe6d1c9252ee638e36a1700b3d712f83ba /include/trace | |
parent | 04fd4cb0b098789725d04e9d4a7e7dda373b1121 (diff) | |
parent | 9a54cf462d6f3c383a5a4f5fe15c020a03db44e6 (diff) | |
parent | 52dc085a50c6b4b8143087ce194d0b193cb3662d (diff) | |
parent | 814cb72e25afccdd24855a26c934c1d3dfbf808e (diff) | |
parent | 3202bb7fb021e81dc988735a8b5f42f82aa912f3 (diff) | |
parent | f777a3a7bd44509d42ecd57135cdb463ea7f023e (diff) | |
parent | c4425c8f26aad2b49c5959fad277c9d109fb8ca3 (diff) | |
parent | 6c3f70ac7c6b4a29b6905be879282628e65f50dd (diff) | |
parent | 1924e05e6014917b23b7648302be39cfee03d047 (diff) | |
download | op-kernel-dev-179023e6af0c608ffb505821223f5580853ef6b8.zip op-kernel-dev-179023e6af0c608ffb505821223f5580853ef6b8.tar.gz |
Merge branches 'for-4.8/upstream-fixes', 'for-4.9/alps', 'for-4.9/hid-input', 'for-4.9/intel-ish', 'for-4.9/kye-uclogic-waltop-fixes', 'for-4.9/logitech', 'for-4.9/sony', 'for-4.9/upstream' and 'for-4.9/wacom' into for-linus