xserver: Branch 'master'

[Dave Airlie]

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

New commits:
commit e4ebfed1785597b48b68e1bbdde3e5c4061b749f
Author: Dave Airlie <airlied at linux.ie>
Date:   Tue May 6 16:46:37 2008 +1000

    xf86edid: fix typo in debug output

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 09d0039..057b93d 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -363,7 +363,7 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
     /* We only do seperate sync currently */
     if (timing->sync != 0x03) {
          xf86DrvMsg(scrnIndex, X_INFO,
-		    "%s: %dx%d Warning: We only handle seperate"
+		    "%s: %dx%d Warning: We only handle separate"
                     " sync.\n", __func__, timing->h_active, timing->v_active);
     }