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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6974f8f 7facf16)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 21 Sep 2012 01:48:10 +0000 (11:48 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 21 Sep 2012 01:48:10 +0000 (11:48 +1000)
commit	10c33f5cc66a7c177a6695e7bd3c60c2cdf8e069
tree	a791c414190c8aa08a476d3992b08b5457fb3715	tree \| snapshot
parent	6974f8f255874a751af74f7bac4da6b9c25012bd	commit \| diff
parent	7facf16690dc4160e5ff605271704183ff56b2d9	commit \| diff

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

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_sdvo.c

16 files changed:

drivers/gpu/drm/ast/ast_mode.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_vidi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.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_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_connector.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc.h	diff1 \|	diff2 \|	blob \| history
include/drm/drm_fourcc.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules