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-01-13 09:32:20 +10:30
2012-01-23 19:47:06 -05:00
2012-01-08 13:10:57 -08:00
2012-01-17 20:50:53 -05:00
2012-01-13 09:32:20 +10:30
2012-01-28 18:20:48 -08:00
2012-01-17 09:54:08 -05:00
2012-02-02 15:47:33 -08:00
2012-01-13 09:32:20 +10:30
2012-01-14 15:07:24 -08:00
2012-02-10 17:14:49 +01:00
2012-01-06 18:15:25 -08:00
2012-01-11 18:53:33 -08:00
2012-01-10 22:01:27 -08:00
2012-01-17 18:40:24 -08:00
2012-01-13 09:32:20 +10:30
2012-01-30 21:33:34 +01:00
2012-01-12 11:53:55 -05:00
2012-01-18 13:48:43 -07:00
2012-02-23 14:56:11 +01:00
2012-01-13 09:32:20 +10:30
2012-01-09 12:09:47 -08:00
2012-01-29 13:06:07 -08:00
2012-01-17 23:30:41 +00:00
2012-01-14 15:07:24 -08:00
2012-01-19 21:26:32 -05:00
2012-01-30 16:18:21 -08:00
2012-01-14 12:32:16 -08:00
2012-01-10 11:08:21 -08:00
2012-01-14 12:32:16 -08:00
2012-01-23 08:38:47 -08:00
2012-01-12 15:44:47 +10:30
2012-01-13 09:32:20 +10:30
2012-01-15 12:24:45 -08:00
2012-01-26 17:04:47 -08:00
2012-01-13 09:32:20 +10:30
2012-01-10 10:36:08 -08:00
2012-01-22 21:10:40 +00:00
2012-01-17 18:40:24 -08:00
2012-01-17 18:40:24 -08:00
2012-01-17 18:40:24 -08:00
2012-01-27 20:40:18 -05:00
2012-01-07 12:03:30 -08:00
2012-01-14 13:25:55 -08:00
2012-01-06 08:02:58 -08:00
2012-01-11 18:50:26 -08:00
2012-01-14 12:32:16 -08:00
2012-01-23 08:44:53 -08:00
2012-01-24 21:33:26 +00:00
2012-01-26 14:13:11 +01:00
2012-01-13 09:32:20 +10:30
2012-01-06 12:11:20 -08:00
2012-01-13 09:32:20 +10:30
2012-01-30 10:16:25 -08:00
2012-01-19 17:26:26 +00:00
2012-01-18 18:03:42 +01:00
2012-01-26 12:43:57 -08:00
2012-01-11 23:29:20 -08:00
2012-01-17 18:40:24 -08:00
2012-02-01 18:29:33 -08:00
2012-01-23 03:15:25 -05:00
2012-01-26 11:19:46 -08:00
2012-01-11 18:50:26 -08:00
2012-01-30 11:38:28 -08:00
2012-01-09 12:09:47 -08:00
2012-01-13 10:12:23 -08:00
2012-01-26 12:43:57 -08:00
2012-01-28 08:10:23 +10:30
2012-01-27 10:01:16 +01:00
2012-01-27 11:14:16 -05:00
2012-01-02 13:04:55 +01:00
2012-01-11 23:58:47 -05:00
ff5f4b0585