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

author	Dave Airlie <airlied@redhat.com>
	Thu, 5 Jun 2014 10:28:59 +0000 (20:28 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Thu, 5 Jun 2014 10:28:59 +0000 (20:28 +1000)
commit	8d4ad9d4bb0a618c975a32d77087694ec6336f68
tree	d18d12688174a623e3503b11118e44ef8186c90b	tree \| snapshot
parent	5ea1f752ae04be403a3dc8ec876a60d7f5f6990a	commit \| diff
parent	9e9a928eed8796a0a1aaed7e0b676db86ba84594	commit \| diff

Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next

Merge drm-fixes into drm-next.

Both i915 and radeon need this done for later patches.

Conflicts:
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c

35 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/early-quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc_helper.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_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	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_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_overlay.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_uncore.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik_sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cikd.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreen.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_asic.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_object.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/sid.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-drm-core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-tve.c	diff1 \|	diff2 \|	blob \| history
include/drm/i915_pciids.h	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/early-quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc_helper.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_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	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_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_overlay.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_uncore.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik_sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cikd.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreen.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_asic.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_object.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/sid.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-drm-core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-tve.c	diff1 \|	diff2 \|	blob \| history
include/drm/i915_pciids.h	diff1 \|	diff2 \|	blob \| history