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)
This pulls in all the drm fixes up to this point which are needed
for some -next patches to work.

1  2 
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/radeon/evergreend.h

Simple merge
Simple merge