diff options
author | 2017-12-28 05:20:07 +1000 | |
---|---|---|
committer | 2017-12-28 05:20:07 +1000 | |
commit | 03bfd4e19b935adb8be4f7342f13395fb7f11096 (patch) | |
tree | f210f9d6e98dc65d6aaa9fde043e4fe2b73636c8 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
parent | i915: Reject CCS modifiers for pipe C on Geminilake (diff) | |
download | wireguard-linux-03bfd4e19b935adb8be4f7342f13395fb7f11096.tar.xz wireguard-linux-03bfd4e19b935adb8be4f7342f13395fb7f11096.zip |
Merge tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
GLK pipe C related fix, and a gvt fix.
* tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel:
i915: Reject CCS modifiers for pipe C on Geminilake
drm/i915/gvt: Fix pipe A enable as default for vgpu
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions