xserver: Branch 'master'

[Dave Airlie]

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

New commits:
commit f30abe30c5fea10e680aa12f3fe37ee8ce1a0201
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Nov 30 13:52:06 2007 +1000

    edid quirk for MAX 0x77e monitor
    
    From RH bugzilla 306441

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 2f26a64..777ef7e 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -72,7 +72,8 @@ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
 {
     /* Belinea 10 15 55 */
     if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
-	DDC->vendor.prod_id == 1516)
+	((DDC->vendor.prod_id == 1516) ||
+	(DDC->vendor.prod_id == 0x77e)))
 	return TRUE;
     
     /* Acer AL1706 */