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: 02b587c b7c0d9d)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Apr 2014 01:18:58 +0000 (11:18 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Apr 2014 01:18:58 +0000 (11:18 +1000)
commit	f70cccd428c8c645d939f93ac5cac292377dc6e6
tree	d65d7d6279615b0173becda3c8ce892770a379fc	tree \| snapshot
parent	02b587ca3511f2b95c7f2938933bc912bedfce53	commit \| diff
parent	b7c0d9df97c10ec5693a838df2fd53058f8e9e96	commit \| diff

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

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

16 files changed:

Documentation/DocBook/drm.tmpl	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_cache.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/Kconfig	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_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_bios.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_bios.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules