| commit | ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Feb 23 14:54:20 2012 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Feb 23 14:56:11 2012 +0100 |
| tree | 18867fdd805f1beefd3592bca76f4794bdc094b8 | |
| parent | de67cba65944f26c0f147035bd62e30c5f456b96 [diff] | |
| parent | 019d96cb55ade38a4b4a52bba0304e8cd681f30a [diff] |
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>