xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 98e170971c6b06d64a5bc7418bf6ae6ae985a3ae
Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
Date:   Mon Oct 14 17:07:29 2013 +0300

    xfree86: Fix the 1792x1344-75 EST III mode
    
    The correct refresh rate for this mode is 75, not 85.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 6fb0f9b..f24294e 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -713,7 +713,7 @@ static const struct {
     {1600, 1200, 75, 0},
     {1600, 1200, 85, 0},
     {1792, 1344, 60, 0},
-    {1792, 1344, 85, 0},
+    {1792, 1344, 75, 0},
     {1856, 1392, 60, 0},
     {1856, 1392, 75, 0},
     {1920, 1200, 60, 1},