diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 17:43:48 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 17:43:48 +0200 |
| commit | a80c69fc08064942ba5038310cd63c42b1d8ed72 (patch) | |
| tree | c81768b6287397efe9b13fb80bad06ac9513d7da /include/linux | |
| parent | drm/i915: Report to userspace if we have a (presumed) working GPU reset (diff) | |
| parent | drm/i915: Only enable cursor if it can be enabled. (diff) | |
Merge branch 'topic/atomic-conversion' into drm-intel-next-queued
The i915 atomic conversion is a real beast and it's not getting easier
wrangling in a separate branch. I'm might be regretting this, but
right after vacation nothing can burst my little bubble here!
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions