From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 20 Mar 2015 10:43:59 +0000 (+0100)
Subject: Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~82^2~24^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9e9cd61f46c07246e30871fd638ffeaca3c576;p=pandora-kernel.git

Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next

Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

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

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

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

0f9e9cd61f46c07246e30871fd638ffeaca3c576
Reading git-diff-tree failed