git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 25f9ceb f164a94)

author	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Tue, 22 Jan 2019 22:51:36 +0000 (14:51 -0800)
committer	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Tue, 22 Jan 2019 22:51:36 +0000 (14:51 -0800)
commit	f42fb2317ffcbd005eeb22b1e49020821a11e23a
tree	d89ccd0c9086c492a32da7ce4c2486c99ed3e805	tree
parent	25f9cebd7a52ddf15405d74fb5fd4c374f301983	commit \| diff
parent	f164a94c2c87752caeb1a3cbe068c440e7f7921f	commit \| diff

Merge drm/drm-next into drm-intel-next-queued

We need avi infoframe stuff who got merged via drm-misc

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

14 files changed:

drivers/gpu/drm/drm_dp_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_request.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.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
drivers/gpu/drm/i915/intel_engine_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lrc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lspcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/selftests/intel_hangcheck.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.