drm: Merge tag 'v3.3-rc7' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Thu, 15 Mar 2012 10:24:32 +0000 (10:24 +0000)
committerDave Airlie <airlied@redhat.com>
Thu, 15 Mar 2012 10:24:32 +0000 (10:24 +0000)
Merge the fixes so far into core-next, needed to test
intel driver.

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


Trivial merge