From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Jul 2011 07:30:11 +0000 (+0100)
Subject: Merge 3.0-rc7 into drm-core-next
X-Git-Tag: v3.1-rc1~230^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cf056edbbe70393faa6edd2b7859a14467910946;p=linux.git

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.
---

cf056edbbe70393faa6edd2b7859a14467910946