From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 23 Jun 2015 06:31:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-next' into HEAD
X-Git-Tag: omap-for-v4.3/fixes-rc1~89^2~36^2~233
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b076ecdf343b029c4c2c3a94ffd0199d97aa46c;p=pandora-kernel.git

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>
---

0b076ecdf343b029c4c2c3a94ffd0199d97aa46c
Reading git-diff-tree failed