tree 1b4fef494bc8d64ed889d52c7aabb4e09e4ffef3
parent 8f539a83efa7dceb7c2257ca96e2dfc846bd12f6
parent ccfb8b2ed4d4e12c3c35de3db5fbbbaa11277736
author Daniel Vetter <daniel.vetter@ffwll.ch> 1436971010 +0200
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1436971010 +0200

Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued

Backmerge fixes since it's getting out of hand again with the massive
split due to atomic between -next and 4.2-rc. All the bugfixes in
4.2-rc are addressed already (by converting more towards atomic
instead of minimal duct-tape) so just always pick the version in next
for the conflicts in modeset code.

All the other conflicts are just adjacent lines changed.

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

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>