xserver: Branch 'master'

[Michel Daenzer]

 randr/rrinfo.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree 8d230319040f0a7f72231da2bf5ec97dc3612e21 (from 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4)
Author: Gustavo Pichorim Boiko <boiko at mandriva.com>
Date:   Tue Jul 24 16:19:19 2007 -0300

    Fix the output->crtc initialization in the old randr setup

diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 858b1ed..bd5d5b1 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -98,6 +98,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rota
 	if (!output)
 	    return;
 	RROutputSetCrtcs (output, &crtc, 1);
+	output->crtc = crtc;
 	RROutputSetConnection (output, RR_Connected);
 #ifdef RENDER
 	RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));