From: Daniel Vetter Date: Wed, 15 Jul 2015 14:36:50 +0000 (+0200) Subject: Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued X-Git-Tag: omap-for-v4.3/fixes-rc1~89^2~36^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca6e4405779ed56ebac941570615abd667c72c02;p=pandora-kernel.git 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 --- ca6e4405779ed56ebac941570615abd667c72c02 Reading git-diff-tree failed