Merge remote-tracking branch 'airlied/drm-next' into HEAD
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 9 Apr 2014 12:33:47 +0000 (14:33 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 9 Apr 2014 12:33:47 +0000 (14:33 +0200)
commit8cbf3202098f191f8b0a0606b2df0af047f21fe5
tree8e49e81e1879de78fcd6ac64041b9a72db06caec
parent04feced98a434c7046108671dc5b6f50f3b63ed7
parentc39b06951f1dc2e384650288676c5b7dcc0ec92c
Merge remote-tracking branch 'airlied/drm-next' into HEAD

Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/
cocinelle patch to avoid endless amounts of conflict hilarity in my
-next queue for 3.16.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/dvo_ns2501.c
drivers/gpu/drm/i915/i915_cmd_parser.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_pm.c
include/drm/drmP.h