| commit | b9e68670cc3a13166b389ce847af19b0d0d33c67 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Thu Dec 02 23:36:21 2010 +0000 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Thu Dec 02 23:50:36 2010 +0000 |
| tree | bb79d91266490fa5bfe77cfef53ead8a1f7a62f6 | |
| parent | 60de2ba51eaba9eefcc355cb20c8582b1481e755 [diff] | |
| parent | 5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a [diff] |
Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_drv.h