Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 2 Dec 2010 23:36:21 +0000 (23:36 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 2 Dec 2010 23:50:36 +0000 (23:50 +0000)
Conflicts:
drivers/gpu/drm/i915/intel_drv.h


Trivial merge