git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Dave Airlie <airlied@redhat.com>
	Tue, 15 Aug 2017 06:16:58 +0000 (16:16 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 15 Aug 2017 06:16:58 +0000 (16:16 +1000)
commit	0c697fafc66830ca7d5dc19123a1d0641deaa1f6
tree	c56336719ca8de16f78ada78e606dffa471e47d5	tree \| snapshot
parent	09ef2378dc42339f3871584dc26d27da220277cb	commit \| diff
parent	ef954844c7ace62f773f4f23e28d2d915adc419f	commit \| diff

Backmerge tag 'v4.13-rc5' into drm-next

Linux 4.13-rc5

There's a really nasty nouveau collision, hopefully someone can take a look
once I pushed this out.

23 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/si.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bridge/tc358767.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/scheduler.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_perf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_color.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ddi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/selftests/mock_gem_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/si.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bridge/tc358767.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/scheduler.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_perf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_color.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_ddi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/selftests/mock_gem_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c	diff1 \|	diff2 \|	blob \| history