git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Thierry Reding <treding@nvidia.com>
	Mon, 21 Oct 2013 11:28:01 +0000 (13:28 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Mon, 21 Oct 2013 11:28:01 +0000 (13:28 +0200)
commit	41dc4136fbadfa7794171161f8211091f43f9591
tree	335a2661356f2b12b0aac97767295231c5887183	tree \| snapshot
parent	56b93c1310b06c7559106606626b2ad870282d3d	commit \| diff
parent	14c8d110e083d3a09ccf8cfe18ad22fe1450c2e9	commit \| diff

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/gpu/drm/drm_fb_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	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_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-drm-core.c	diff1 \|	diff2 \|	blob \| history