Backmerge v4.1-rc4 into into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 20 May 2015 06:23:53 +0000 (16:23 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 20 May 2015 06:23:53 +0000 (16:23 +1000)
commitbdcddf95e82b1c4e370fc1196b1f4f50f775dab4
treeef2af2b3faee1f8e8287ca45d265809f56fbd0f6
parent91d9f9856f91c82ac6289a0fff65dd12cfa07e34
parente26081808edadfd257c6c9d81014e3b25e9a6118
Backmerge v4.1-rc4 into into drm-next

We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_irq.c
MAINTAINERS
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_lvds.c