xserver: Branch 'master'

[Dave Airlie]

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

New commits:
commit 08afc70513e5496cc5cd8b76c8658c4292119e4b
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Feb 28 10:45:41 2008 +1000

    quirks: another LPL panel with the cm/mm wrong

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index b865727..c366a38 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -110,8 +110,9 @@ static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC)
 {
     /* Bug #10304: "LGPhilipsLCD LP154W01-A5" */
     /* Bug #12784: "LGPhilipsLCD LP154W01-TLA2" */
+    /* Red Hat #435216 "LGPhilipsLCD LP154W01-TLAE" */
     if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
-	DDC->vendor.prod_id == 0)
+	(DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00)
 	return TRUE;
 
     /* Bug #11603: Funai Electronics PM36B */