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

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

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 16 Jun 2016 12:18:30 +0000 (14:18 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 16 Jun 2016 12:18:30 +0000 (14:18 +0200)
commit	f5e011e222fe75b838b0a90b4b31bbcd13a41fcf
tree	0014d2ac89e6209c565f5a8fc53abd8dce13e63e	tree \| snapshot
parent	51b9539f2e24660b00ffa926d45f7c9b77cea51a	commit \| diff
parent	15f120903f7a6025f3ec53108cbbfddb8dcdc5d6	commit \| diff

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge drm-next to get at the nonblocking atomic helpers, needed to
merge the i915 conversion.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_vgpu.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history