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)
commitb9e68670cc3a13166b389ce847af19b0d0d33c67
treebb79d91266490fa5bfe77cfef53ead8a1f7a62f6
parent60de2ba51eaba9eefcc355cb20c8582b1481e755
parent5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_lvds.c