Merge tag 'v4.1-rc6' into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2015 23:23:51 +0000 (09:23 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2015 23:23:51 +0000 (09:23 +1000)
commita8a50fce60e86f82e442bf84b8af20750b3d6105
tree974c04f9f4f10275a8a9435113ea5b307d172bb6
parent9b5edbf7a462b7c846e9d4675b9b72b7a4e84de9
parentc65b99f046843d2455aa231747b5a07a999a9f3d
Merge tag 'v4.1-rc6' into drm-next

Linux 4.1-rc6

backmerge 4.1-rc6 as some of the later pull reqs are based on newer bases
and I'd prefer to do the fixup myself.
MAINTAINERS
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/radeon/atombios_dp.c
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/ni.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_audio.c
drivers/gpu/drm/radeon/si.c