Dave Airlie bdcddf95e8 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

2015-05-20 16:23:53 +10:00

32 KiB

Raw Blame History

View Raw