Merge remote-tracking branch 'airlied/drm-next' into HEAD
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 23 Jun 2015 06:31:49 +0000 (08:31 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 23 Jun 2015 12:01:53 +0000 (14:01 +0200)
commit0b076ecdf343b029c4c2c3a94ffd0199d97aa46c
tree38407c97a7f90cb46a9e8c487676a65ce2ed9209
parentc82435bbe5aca62fc54615ff8ba78134bfa33866
parent9eb1e57f564d4e6e10991402726cc83fe0b9172f
Merge remote-tracking branch 'airlied/drm-next' into HEAD

Backmerge drm-next because the conflict between Ander's atomic fixes
for 4.2 and Maartens future work are getting to unwielding to handle.

Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.h

Just always take ours, same as git merge -X ours, but done by hand
because I didn't trust git: It's confusing that it doesn't show any
conflicts in the merge diff at all.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_csr.c
drivers/gpu/drm/i915/intel_display.c