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: eaab077 bd60254)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 8 Jan 2014 01:52:41 +0000 (12:52 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 8 Jan 2014 01:52:41 +0000 (12:52 +1100)
commit	d76111ef5a001587333d11e0eaf5e17ad6a3ad60
tree	6f1b06cb7538fb10aacc6ad3161279cebe7cbfe3	tree \| snapshot
parent	eaab0772d76f4ad7e4a91926dde2068015e4c222	commit \| diff
parent	bd602544712edf72a128bc81d02f0a8051cb1372	commit \| diff

Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_pm.c

13 files changed:

drivers/gpu/drm/i915/Makefile	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.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ddi.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_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_opregion.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules