]> git.baikalelectronics.ru Git - kernel.git/commit
Merge airlied/drm-next into drm-intel-next-queued
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 8 Dec 2017 18:15:30 +0000 (10:15 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 8 Dec 2017 18:15:30 +0000 (10:15 -0800)
commite824b687f5f49294d59e69f7a70d7baf5e5aa637
tree371aa801a5a211f5f8af87bd5488e3dae75ea975
parent220572e346fef1a2c4688d4988ab28777e1f3b4f
parent78223b475eb70a7c42ab6663d15dc01f83d59c6a
Merge airlied/drm-next into drm-intel-next-queued

Chris requested this backmerge for a reconciliation on
drm_print.h between drm-misc-next and drm-intel-next-queued

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gvt/Makefile
drivers/gpu/drm/i915/gvt/display.c
drivers/gpu/drm/i915/gvt/scheduler.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_ringbuffer.h
include/uapi/linux/vfio.h