git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 30 Jan 2014 11:56:51 +0000 (12:56 +0100)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 30 Jan 2014 11:56:51 +0000 (12:56 +0100)
commit	7306cba69a05739f1384c2abd7f3bb9dfe5907fa
tree	1b10297d37170a1e00b4f2211f4296c2b0020f8d	tree \| snapshot
parent	c3d40ce1c1aa76d143fe79bf37c65aefdba45b35	commit \| diff
parent	7c03f8bacb4fd7699b9710a6eb13eaedf0fc27e3	commit \| diff

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>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history