git.samba.org - sfrench/cifs-2.6.git/commit

author	Dave Airlie <airlied@redhat.com>
	Mon, 9 May 2016 03:49:56 +0000 (13:49 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 9 May 2016 03:49:56 +0000 (13:49 +1000)
commit	bafb86f5bc3173479002555dea7f31d943b12332
tree	6ec94c96460faf782cdb8781339560e13e0918b0	tree
parent	ba391646d0d43aee3596b616113cce0f22dde627	commit \| diff
parent	44549e8f5eea4e0a41b487b63e616cb089922b99	commit \| diff

Merge tag 'v4.6-rc7' into drm-next

Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.

23 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arc/boot/dts/axs10x_mb.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/tonga_ih.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_dp_mst_topology.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_fimd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_display.c	diff1 \|	diff2 \|	blob \| history

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arc/boot/dts/axs10x_mb.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/tonga_ih.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_dp_mst_topology.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_fimd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_display.c	diff1 \|	diff2 \|	blob \| history