xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 757c11630d5999ad13dcac79191429badc92a3a6
Author: Tormod Volden <lists.tormod at gmail.com>
Date:   Wed Oct 28 23:10:43 2009 +0100

    xfree86: Fix description of DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE
    
    The message ending up in the log is misleading as to what the quirk
    actually does: It ignores the sizes in the detailed timings and
    replaces them with the display "Max Image Size".
    
    Signed-off-by: Tormod Volden <debian.tormod at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 2f80070..058e75d 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -266,7 +266,7 @@ static const ddc_quirk_map_t ddc_quirks[] = {
     },
     {
 	quirk_detailed_use_maximum_size,   DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE,
-	"Detailed timings give sizes in cm."
+	"Use maximum size instead of detailed timing sizes."
     },
     {
 	quirk_first_detailed_preferred, DDC_QUIRK_FIRST_DETAILED_PREFERRED,