git.maquefel.me Git - linux.git/commit

author	Dave Airlie <airlied@redhat.com>
	Thu, 22 Jan 2015 00:44:41 +0000 (10:44 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Thu, 22 Jan 2015 00:44:41 +0000 (10:44 +1000)
commit	281d1bbd34b734e4f22b30b6f3b673dda46a7470
tree	f67a2d45d248e9deaa1c68d3f8f33cdf476daacd	tree \| snapshot
parent	bfa55bd4990815b055162b6d5d031f37a39942a5	commit \| diff
parent	b942c653ae265abbd31032f3b4f5f857e5c7c723	commit \| diff

Merge remote-tracking branch 'origin/master' into drm-next

Backmerge Linus tree after rc5 + drm-fixes went in.

There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.

Conflicts:
drivers/gpu/drm/amd/amdkfd/Makefile
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
drivers/gpu/drm/amd/include/kgd_kfd_interface.h
drivers/gpu/drm/i915/intel_runtime_pm.c
drivers/gpu/drm/radeon/radeon_kfd.c

20 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c	diff1 \|	\|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_topology.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/include/kgd_kfd_interface.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_runtime_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik_sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_kfd.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c	diff1 \|	\|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_topology.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/include/kgd_kfd_interface.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_runtime_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik_sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_kfd.c	diff1 \|	diff2 \|	blob \| history