git.osdn.net Git - android-x86/kernel.git/commit

(root) / android-x86 / 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	9a652cc01e589e10e2aa341074ea240c9838102b
tree	48ec31db7a09a0e6b7cca66ea08b20cc78f218cb	tree \| snapshot
parent	e8fcdf1e65c71340972041295fb7b3e59929b761	commit \| diff
parent	99ee87295017e36abb6925e6139ca303cb55aee7	commit \| diff

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

Backmerge request by Jani to get at

commit 249c4f538b1aae55d41699f8bafc6cb762a7f48f
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>

kernel

RSS Atom

About OSDN

Find Software

Develop Software

Help

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