diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-02-28 12:12:03 +0200 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-02-28 12:12:03 +0200 |
| commit | f074037a2eb1ff21e258a27a6270bae126ded062 (patch) | |
| tree | 06026bbe2f356f61a57cf420e0075a9986ad41e4 /drivers/gpu/drm/i915/gvt/firmware.c | |
| parent | 73c0fcac97bf7f4a6a61b825b205d1cf127cfca7 (diff) | |
| parent | b8a89f530f5692c70778c965f0bc8f5a61fbe703 (diff) | |
Merge drm-next into drm-intel-next-queued
To pull in the HDCP changes, especially wait_for changes to drm/i915
that Chris wants to build on top of.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/firmware.c')
0 files changed, 0 insertions, 0 deletions