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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ea7428b 0b2443e)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Sep 2012 01:52:08 +0000 (11:52 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Sep 2012 01:52:08 +0000 (11:52 +1000)
commit	5460e309e53b4bcde4d39e19473ebc4f26980fc0
tree	79b7e50979ccd19d4bd661c009d757a1d39be145	tree \| snapshot
parent	ea7428b5111bb34277e6dcfd6a7a469c50e3693e	commit \| diff
parent	0b2443ed4e07d7973e4554a2cc166bc35447b59e	commit \| diff

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

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

15 files changed:

drivers/gpu/drm/ast/ast_mode.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/i915/intel_sdvo.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

Linux kernel for KaRo TX COM modules