Merge remote branch 'airlied/drm-next' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Tue, 1 Dec 2009 17:01:54 +0000 (09:01 -0800)
committerEric Anholt <eric@anholt.net>
Tue, 1 Dec 2009 17:01:54 +0000 (09:01 -0800)
commitf40d6817a5c2bf84f5fe7b5d1a83f1e8f8669951
tree1c515a34a60f65cbfd3cf1a387427d0a9fdf878f
parent103a196f4224dc6872081305cf7f82ebf67aa7bd
parent46557bef3f3834ac33031c7be27d39d90d507442
Merge remote branch 'airlied/drm-next' into drm-intel-next
drivers/gpu/drm/drm_crtc.c
include/drm/drmP.h
include/drm/drm_crtc.h