git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Dave Airlie <airlied@redhat.com>
	Fri, 16 Oct 2015 00:10:32 +0000 (10:10 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Fri, 16 Oct 2015 00:25:28 +0000 (10:25 +1000)
commit	9153483d61cde536fab9295bcc3d2e5870a4374d
tree	71461989ebe8a20258ca4b0be341b755594a2b0b	tree \| snapshot
parent	208a4daee90645353ea56b38b2d9519c66f9656e	commit \| diff
parent	c90abcb99330e2602a17bb906c12636b02dcdddf	commit \| diff

Merge commit 'c90abcb99330e2602a17bb906c12636b02dcdddf' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Backmerge the drm-fixes pull from Linus's tree into drm-next.

This is to fix some conflicts and make future pulls cleaner

20 files changed:

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fb_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp_mst.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lrc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lrc.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_runtime_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_pm.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_dp_helper.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fb_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp_mst.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lrc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lrc.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_runtime_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_pm.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_dp_helper.h	diff1 \|	diff2 \|	blob \| history