]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:22:28 +0000 (14:22 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:22:28 +0000 (14:22 +0100)
commit1eac9abf75cace2b55ad33b4b0adce69d5cafdb3
tree597a5c1068561f7708cfd77ad9649b63e6c498b8
parentd09516237c00b52ffed8dc5e599297bfea6b3bdf
parent14c8d110e083d3a09ccf8cfe18ad22fe1450c2e9
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_pm.c
drivers/staging/imx-drm/imx-drm-core.c