From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 18 Mar 2014 08:43:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
X-Git-Tag: v3.15-rc1~51^2~55^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e19b9137142988bec5a76c5f8bdf12a77ea802b0;p=pandora-kernel.git

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/Makefile

Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

e19b9137142988bec5a76c5f8bdf12a77ea802b0
Reading git-diff-tree failed