From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 23 Feb 2012 13:54:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'airlied/drm-next' into for-airlied
X-Git-Tag: v3.4-rc1~143^2~85^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1;p=pandora-kernel.git

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

Manually resolve the conflict between the new enum drm property
helpers in drm-next and the new "force-dvi" option that the "audio" output
property gained in drm-intel-next.

While resolving this conflict, switch the new drm_prop_enum_list to
use the newly introduced enum defines instead of magic values.

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

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

ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1
Reading git-diff-tree failed