xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/ddc/xf86DDC.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit f650c1aeb06e957626bb0a74eddbb133f59dbecb
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Oct 10 14:07:28 2008 -0400

    Revert "Don't leak EDID_block"
    
    This reverts commit 05cdef18ca668ffc86b71033f71cfbd262cdd994.
    
    http://lists.freedesktop.org/archives/xorg/2008-October/039305.html

diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index ad8feef..0d86776 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -249,7 +249,6 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
 
 	tmp = xf86InterpretEEDID(scrnIndex, EDID_block);
     }
-    xfree(EDID_block);
 
     if (tmp && complete)
 	tmp->flags |= EDID_COMPLETE_RAWDATA;