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	4e95e1df979f7d6ac30be6871073b173e15c45e0
tree	48ec31db7a09a0e6b7cca66ea08b20cc78f218cb	tree \| snapshot
parent	fe85be5b8985feeda3fd4fb4aa6def5ef11f3c02	commit \| diff
parent	e34f45968bb6069e7bdc286f6e9591683580e1ee	commit \| diff

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

Backmerge request by Jani to get at

commit cf65763c98b7ef0d58744681d7324dd6345299b5
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