]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:54:46 +0000 (11:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:54:46 +0000 (11:54 +1000)
commit02201f36a5e698c876844c3c68cd85156fba85aa
tree6941e766ffb08c2872e76a3ca2c2ee68a089d5f8
parent419a9111c11b1dc780b837ba9aecaa28b1829fa8
parent712188772816423e80c8760c593d06151dc12abc
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c
18 files changed:
MAINTAINERS
drivers/gpu/drm/i915/i915_dma.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
drivers/gpu/drm/i915/intel_bios.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_uncore.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/staging/imx-drm/imx-drm-core.c
drivers/staging/imx-drm/imx-tve.c
include/drm/i915_pciids.h
lib/Kconfig.debug
lib/Makefile