Backmerge tag 'v4.7' into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 26 Jul 2016 07:26:29 +0000 (17:26 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 26 Jul 2016 07:26:29 +0000 (17:26 +1000)
commit5e580523d9128a4d8364fe89d36c38fc7819c8dd
tree852fb2427d980830ae8686a91e4ca5873f259ab9
parentc11dea5b0290984fa48111957ba3fdc5b3bdae5a
parent523d939ef98fd712632d93a5a2b588e477a7565e
Backmerge tag 'v4.7' into drm-next

Linux 4.7

As requested by Daniel Vetter as the conflicts were getting messy.
24 files changed:
MAINTAINERS
Makefile
arch/x86/kernel/early-quirks.c
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
drivers/gpu/drm/i915/i915_gem_shrinker.c
drivers/gpu/drm/i915/intel_csr.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_lrc.c
drivers/gpu/drm/i915/intel_opregion.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/sun4i/sun4i_crtc.c
drivers/gpu/drm/sun4i/sun4i_drv.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
include/drm/ttm/ttm_bo_api.h