]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge remote branch 'airlied/drm-core-next' into HEAD
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 8 Sep 2010 09:13:14 +0000 (10:13 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 8 Sep 2010 09:13:14 +0000 (10:13 +0100)
1  2 
drivers/gpu/drm/i915/i915_drv.c

Simple merge