]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorDave Airlie <airlied@gmail.com>
Thu, 29 Jan 2015 01:45:31 +0000 (11:45 +1000)
committerDave Airlie <airlied@gmail.com>
Thu, 29 Jan 2015 01:45:31 +0000 (11:45 +1000)
commitb3869b17fd63bacb53ac4db4ff4ba093701e17be
tree073873d62957033f317bc413d9ea9fd5d5ff5a50
parent7b83741bf76caad72bc8a701c26dde8d6751ff0f
parentc59c961ca511dc7ee2f4f7e9c224d16f5c76ca6e
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
14 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
drivers/gpu/drm/amd/amdkfd/kfd_device.c
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
drivers/gpu/drm/amd/amdkfd/kfd_module.c
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
drivers/gpu/drm/radeon/cik_sdma.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_asic.c
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/radeon_kfd.c
drivers/gpu/drm/radeon/rs600.c