Merge remote branch 'airlied/drm-core-next' into tmp
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 19 Oct 2010 08:13:00 +0000 (09:13 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 19 Oct 2010 08:14:50 +0000 (09:14 +0100)
commitfb9a90f7c674f3ddef6baf55cb1612dadd8ea752
treef25cf2ce17449ba34cdfdfb948134eb3464e400e
parent2d7b8366ae4a9ec2183c30e432a4a9a495c82bcd
parent21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7
Merge remote branch 'airlied/drm-core-next' into tmp
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c