Merge remote branch 'linus' into drm-intel-fixes
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 08:14:55 +0000 (09:14 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 08:14:55 +0000 (09:14 +0100)
commitdb8c076b9206ea35b1f7299708d5510b17674db2
tree7a5ee32db0c25bb29598c7c300ce7f2680f533a9
parentaf6261031317f646d22f994c0b467521e47aa49f
parentb30a3f6257ed2105259b404d419b4964e363928c
Merge remote branch 'linus' into drm-intel-fixes
drivers/gpu/drm/i915/intel_crt.c