xserver: Branch 'master'

[Matthias Hopf]

 hw/xfree86/modes/xf86Crtc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8511a964f81b3b06a526f0fca4232afb2152f405
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Dec 16 18:21:20 2008 +0100

    randr: Update EDID_ATOM_NAME to reflect RandR 1.3 name change

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index ef2ecb7..b4fe3b1 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2748,7 +2748,7 @@ xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
 
 #ifdef RANDR_12_INTERFACE
 
-#define EDID_ATOM_NAME		"EDID_DATA"
+#define EDID_ATOM_NAME		"EDID"
 
 /**
  * Set the RandR EDID property