xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 318257029578a30e29c191befa94a20ad07f97d4
Author: Frank Binns <frank.binns at imgtec.com>
Date:   Thu May 11 14:00:19 2017 +0100

    hw/xfree86: fix comment typo
    
    Signed-off-by: Frank Binns <frank.binns at imgtec.com>

diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index bac213a73..6d46a5621 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -916,7 +916,7 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
  * information.  If a command-line name is specified, then this function
  * fails if it is not found.
  *
- * The return value is a pointer to the actual name of the direcoty that was
+ * The return value is a pointer to the actual name of the directory that was
  * opened.  When no directory is found, the return value is NULL. The caller
  * should free() the returned value.
  *