]> 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, 20 Dec 2013 01:32:25 +0000 (12:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 01:32:25 +0000 (12:32 +1100)
commitf56f43acaa073e75978caf11905380207a940d0f
tree4e1a48ffca200b8c60a9edd8a5877cf5f0b29470
parentaaa4bf92fd24cf72a6bdd1c9b679e62a6f2ca637
parentfe3c703c3d80bd4c2da0d47a7d56930926af7cbc
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/intel_pm.c
drivers/staging/imx-drm/imx-drm-core.c
14 files changed:
drivers/gpu/drm/armada/armada_drv.c
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_context.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_opregion.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/staging/imx-drm/imx-drm-core.c