Merge tag 'v4.0-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 8 Apr 2015 21:48:27 +0000 (07:48 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 8 Apr 2015 21:48:27 +0000 (07:48 +1000)
Linux 4.0-rc7

Requested by Alex for fixes -next needs.

Conflicts:
drivers/gpu/drm/i915/intel_sprite.c

1  2 
MAINTAINERS
drivers/gpu/drm/i915/intel_sprite.c

diff --cc MAINTAINERS
Simple merge
Simple merge