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)
commit1d8ac08d498d579aae36221a80b4b724b2f52f39
tree3177ed7b82edbb34055da95c50b418db5cd4ba60
parent5c7f0c27956a9884e29dbe5f83e56609fa00290f
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1
Merge tag 'v4.0-rc7' into drm-next

Linux 4.0-rc7

Requested by Alex for fixes -next needs.

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