git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 17 May 2016 10:15:49 +0000 (12:15 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 17 May 2016 10:15:49 +0000 (12:15 +0200)
commit	57082e8dc40f1685347762556a74699a87cf8c9a
tree	48ec31db7a09a0e6b7cca66ea08b20cc78f218cb	tree \| snapshot
parent	3c9f9c698f115fae8ea35d258af60a7964dee821	commit \| diff
parent	2af5364c630acbf9d8e11d135963eba07c125593	commit \| diff

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge request by Jani to get at

commit 20a9ff6ac6dd49e472afb2c61665bf4019af5c80
Author: Deepak M <m.deepak@intel.com>
Date: Wed Mar 30 17:03:39 2016 +0300

drm: Add new DCS commands in the enum list

Some simple conflicts in intel_dp.c.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Linux Kernel Source Tree.

RSS Atom

Documentation/DocBook/gpu.tmpl	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.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/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp_mst.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
include/drm/drm_dp_helper.h	diff1 \|	diff2 \|	blob \| history