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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 03:20:46 +0000 (13:20 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 03:20:46 +0000 (13:20 +1000)
commit	6b59ef13a93c636f4fffed77ed327cf9444c6683
tree	07cb3bb0d12a235fc5330f2710b1f1f2c3c10347	tree \| snapshot
parent	e8735f971ff30c052644b22ec23cdd4b0a3b3e68	commit \| diff
parent	1b23170a8e14ef62ad1daa957aa528212a8d0aef	commit \| diff

Merge commit 'refs/next/20120427/drm'

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

21 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_crt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ringbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_encoders.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r100.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_irq_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si.c	diff1 \|	diff2 \|	blob \| history
include/linux/vgaarb.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_crt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ringbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atombios_encoders.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r100.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_irq_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si.c	diff1 \|	diff2 \|	blob \| history
include/linux/vgaarb.h	diff1 \|	diff2 \|	blob \| history