git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

author	Dave Airlie <airlied@redhat.com>
	Tue, 26 Jul 2016 07:26:29 +0000 (17:26 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 26 Jul 2016 07:26:29 +0000 (17:26 +1000)
commit	5e580523d9128a4d8364fe89d36c38fc7819c8dd
tree	852fb2427d980830ae8686a91e4ca5873f259ab9	tree \| snapshot
parent	c11dea5b0290984fa48111957ba3fdc5b3bdae5a	commit \| diff
parent	523d939ef98fd712632d93a5a2b588e477a7565e	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/early-quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_shrinker.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_csr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lrc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_opregion.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_api.h	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/early-quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_shrinker.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_csr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lrc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_opregion.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_api.h	diff1 \|	diff2 \|	blob \| history