Merge 3.0-rc7 into drm-core-next
authorDave Airlie <airlied@redhat.com>
Wed, 13 Jul 2011 07:30:11 +0000 (08:30 +0100)
committerDave Airlie <airlied@redhat.com>
Wed, 13 Jul 2011 07:30:22 +0000 (08:30 +0100)
commitcf056edbbe70393faa6edd2b7859a14467910946
treeca30ef021f12d1f06e18856a60f815ba63e78f60
parent58b6542b50ded4243c26c251c0507e5f658642f6
parent620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc
Merge 3.0-rc7 into drm-core-next

This pulls in all the drm fixes up to this point which are needed
for some -next patches to work.
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/radeon/evergreend.h