git.maquefel.me Git - linux.git/commit

author	Dave Airlie <airlied@redhat.com>
	Tue, 16 Sep 2014 01:28:52 +0000 (11:28 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 16 Sep 2014 01:38:04 +0000 (11:38 +1000)
commit	b2efb3f0a1db62aff5e824125785ec6731143b6d
tree	67510cec69e18e55d82bed803428b2a5027d92bb	tree \| snapshot
parent	4ac073640a528662a7c072a30e92e70ce00ded33	commit \| diff
parent	9e82bf014195d6f0054982c463575cdce24292be	commit \| diff

drm: backmerge tag 'v3.17-rc5' into drm-next

This is requested to get the fixes for intel and radeon into the
same tree for future development work.

i915_display.c: fix missing dev_priv conflict.

20 files changed:

drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
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_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_bios.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_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ringbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/hdmi/hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_semaphore.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/ipuv3-plane.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
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_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_bios.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_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ringbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/hdmi/hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_semaphore.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/ipuv3-plane.c	diff1 \|	diff2 \|	blob \| history