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	219654c6ceda810b65a628f107d30ea1a970e9d7
tree	1b10297d37170a1e00b4f2211f4296c2b0020f8d	tree \| snapshot
parent	cfaab19369c82598788f661ef28420911f29e185	commit \| diff
parent	bc850d56f34facbcc3e3907d8218aa817d0c569d	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