commit | bba73071b6f71be0a101658d7c13866e30b264a6 | [log] [tgz] |
---|---|---|
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | Thu Mar 01 11:14:24 2018 +0200 |
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | Thu Mar 01 11:14:24 2018 +0200 |
tree | 2a0ea1fc5fd975f1c2e9e50de5bb3cb2cb3cb5f7 | |
parent | c71b53cc66c5053ff3524a6132f8fc8199d618c3 [diff] | |
parent | f073d78eeb8efd85718e611c15f9a78647751dea [diff] |
Merge drm-next into drm-intel-next-queued (this time for real) 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>