Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 30 Jan 2014 11:56:51 +0000 (12:56 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 30 Jan 2014 11:56:51 +0000 (12:56 +0100)
commite515b47e5646154448e46231d811919d93923da5
tree1b10297d37170a1e00b4f2211f4296c2b0020f8d
parentc2c1d4912cd7028384d7f25d2faefefb8958f64d
parentef64cf9d06049e4e9df661f3be60b217e476bee1
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge drm-next - I need to backmerge drm-intel-fixes patches
touching the error capture code to be able to merge Ben's cleanup
patches.

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

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/intel_display.c