Daniel Vetter ff5f4b0585
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 >
2012-02-23 14:56:11 +01:00
2012-02-13 12:28:13 +00:00
2012-01-06 10:01:35 +00:00
2011-10-19 09:47:47 +01:00
2012-02-13 12:28:13 +00:00
2012-02-02 15:26:50 +00:00
2012-01-24 17:35:52 +00:00
2012-02-03 09:38:05 +00:00
2011-06-17 09:28:01 +10:00
2012-02-03 09:31:14 +00:00
2012-02-16 09:18:13 +00:00
2012-01-03 09:45:12 +00:00
2012-02-23 14:56:11 +01:00
2012-02-13 12:28:13 +00:00
2012-02-03 09:38:05 +00:00
2012-01-23 11:03:26 +00:00
2012-01-23 11:03:26 +00:00
2011-10-18 09:44:52 +01:00
2012-02-03 09:41:35 +00:00
2012-02-03 09:41:35 +00:00
2011-10-18 09:53:05 +01:00
2012-01-06 09:15:42 +00:00
2011-12-20 19:52:12 +00:00
2012-01-03 09:40:47 +00:00
2011-12-20 19:52:12 +00:00
2011-12-19 18:40:26 +00:00
2012-02-03 09:31:14 +00:00
2011-10-18 09:44:38 +01:00
2011-12-20 19:49:36 +00:00
2012-02-13 12:28:13 +00:00
2012-01-03 09:40:47 +00:00
2012-01-05 10:03:33 +00:00
2012-02-13 12:28:13 +00:00
2011-12-01 09:57:34 +00:00
2012-01-06 09:16:38 +00:00
2012-01-06 09:15:42 +00:00
2012-01-03 09:17:16 +00:00
2012-02-02 15:25:16 +00:00
2012-02-03 09:32:30 +00:00
2012-01-24 17:34:32 +00:00
2012-02-03 09:31:14 +00:00
2011-08-31 14:06:19 +01:00
2011-11-12 17:46:40 +00:00
2011-11-03 17:53:18 +00:00
2012-02-16 18:31:07 +00:00
2012-01-09 12:10:09 +00:00
2011-10-03 18:37:37 +01:00
2012-02-01 15:41:39 +00:00
2012-02-16 18:35:11 +00:00
2012-02-13 12:28:13 +00:00
2012-01-24 17:35:52 +00:00
2012-02-09 10:34:43 +00:00
2012-01-06 09:16:09 +00:00
2012-01-09 12:49:48 +00:00
2012-01-09 12:10:09 +00:00
2012-02-03 09:38:05 +00:00
2012-01-23 11:00:48 +00:00
2011-10-18 09:53:05 +01:00
2012-02-16 18:31:07 +00:00
2011-12-20 14:43:53 +00:00
2011-10-18 09:53:05 +01:00
2011-07-25 20:57:13 -07:00
2012-01-24 17:35:52 +00:00
2012-02-13 12:28:13 +00:00
2012-01-06 09:15:42 +00:00
2011-12-20 19:50:56 +00:00
2011-07-26 09:21:09 -07:00
2012-01-25 09:42:06 +00:00
2011-12-20 19:52:12 +00:00
2012-01-05 10:03:53 +00:00
2011-10-18 09:53:05 +01:00
2012-01-05 10:02:42 +00:00
2012-01-06 09:34:03 +00:00
2012-02-13 12:28:13 +00:00
2011-12-20 19:52:12 +00:00
2012-01-13 09:02:34 +00:00
2011-12-20 19:52:12 +00:00
2011-12-20 19:52:12 +00:00
2011-12-20 19:52:12 +00:00
Daniel Vetter
ff5f4b0585