Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 28 Sep 2010 14:48:38 +0000 (15:48 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 28 Sep 2010 14:48:38 +0000 (15:48 +0100)
commite0e41598b433c0216814d54c62e7c1834f464d9b
treea4069b104045797da2dc48c62e1acba0132ba98d
parent8daf7473203cd9bd1b9b98200ee1c74dfe4826fe
parentd270ae34eb77c58dea60e5b1e300a698d2ce39ac
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_sdvo.c