xserver: Branch 'master'

[Adam Jackson]

 Xext/vidmode.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f8151c7a4bcf2d55848e70c83b2f9ce458cf316
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 14 11:20:39 2016 -0400

    Fix the typo from the previous patch, d'oh
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/Xext/vidmode.c b/Xext/vidmode.c
index 0cbbdc3..499a2a8 100644
--- a/Xext/vidmode.c
+++ b/Xext/vidmode.c
@@ -662,7 +662,7 @@ ProcVidModeDeleteModeLine(ClientPtr client)
             bytes_to_int32(sizeof(xXF86VidModeDeleteModeLineReq));
     }
     if (len != stuff->privsize) {
-        DebufF("req_len = %ld, sizeof(Req) = %d, privsize = %ld, "
+        DebugF("req_len = %ld, sizeof(Req) = %d, privsize = %ld, "
                "len = %d, length = %d\n",
                (unsigned long) client->req_len,
                (int) sizeof(xXF86VidModeDeleteModeLineReq) >> 2,