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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a942b3c 1291a0d)

author	Dave Airlie <airlied@redhat.com>
	Tue, 19 Dec 2017 11:37:24 +0000 (21:37 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 19 Dec 2017 11:37:24 +0000 (21:37 +1000)
commit	6b7dcb536e3535444c39286333f10d06d2f44fb5
tree	6a4c1e30e5900626e506d46b100d21a2fcd59003	tree \| snapshot
parent	a942b3c2cddc4378482a427845d15c78eb50f4d4	commit \| diff
parent	1291a0d5049dbc06baaaf66a9ff3f53db493b19b	commit \| diff

BackMerge tag 'v4.15-rc4' into drm-next

Linux 4.15-rc4

Daniel requested it to fix some messy conflicts.

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/base/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_debug.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_resource.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dcn10/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_mm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_mode_config.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/scheduler.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_connector.h	diff1 \|	diff2 \|	blob \| history
include/drm/drm_mode_config.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree