Merge remote branch 'airlied/drm-next' into drm-intel-next
Eric Anholt [Tue, 1 Dec 2009 17:01:54 +0000 (09:01 -0800)]
1  2 
drivers/gpu/drm/drm_crtc.c
include/drm/drmP.h
include/drm/drm_crtc.h

Simple merge
Simple merge
Simple merge