xserver: Branch 'master'

[Keith Packard]

 exa/exa_unaccel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37
Author: Thierry Reding <treding at nvidia.com>
Date:   Wed Jun 25 16:03:29 2014 +0200

    exa: Fix a warning when enabling DEBUG_TRACE_FALL
    
    The format string wants a picture and a character, but the argument list
    contains only a character, causing GCC to complain. Add the missing
    argument.
    
    Signed-off-by: Thierry Reding <treding at nvidia.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 58262e0..b0c6344 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -685,7 +685,7 @@ ExaCheckAddTraps(PicturePtr pPicture,
 
     EXA_PRE_FALLBACK(pScreen);
 
-    EXA_FALLBACK(("to pict %p (%c)\n",
+    EXA_FALLBACK(("to pict %p (%c)\n", pPicture,
                   exaDrawableLocation(pPicture->pDrawable)));
     exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
     swap(pExaScr, ps, AddTraps);