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)
commitb970be7c4114173e733309eec092a0269e1e6a61
tree94b1c201d6330186ee5831d149818143cf9216e3
parentc3add4b63438555d5e88c5893d238ab80d1f5959
parentcbc60ca04b342a4e1f2a1086a7277c077f07dbed
Merge remote branch 'airlied/drm-core-next' into HEAD
drivers/gpu/drm/i915/i915_drv.c