Merge branch 'drm-intel-fixes' into HEAD
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 10:19:32 +0000 (11:19 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 10:19:32 +0000 (11:19 +0100)
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c


No differences found