git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 18 Jan 2016 07:04:23 +0000 (08:04 +0100)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 18 Jan 2016 07:18:16 +0000 (08:18 +0100)
commit	2da80b57c69a2a5ae0e16dead8cdbfab46f970bc
tree	402529def53a1b32066493f5581c3e1810d11a1d	tree \| snapshot
parent	2d7f3bdb2cf6656386cb9ca1b02dd6df66fb05e8	commit \| diff
parent	1df59b8497f47495e873c23abd6d3d290c730505	commit \| diff

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

Pull in Dave's drm-next pull request to have a clean base for 4.6.
Also, we need the various atomic state extensions Maarten recently
created.

Conflicts are just adjacent changes that all resolve to nothing in git
diff.

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

John Crispins staging tree

RSS Atom

Documentation/DocBook/gpu.tmpl	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ddi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp_mst.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sprite.c	diff1 \|	diff2 \|	blob \| history