xserver: Branch 'master'

[Keith Packard]

 config/udev.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 70b127c9f1c53bdb42f078265e67f76b464deae2
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Jan 10 17:01:17 2013 -0800

    config/udev: fix "removing GPU device" format string mistake
    
     udev.c: In function 'device_removed':
     udev.c:270:9: warning: format '%d' expects argument of type 'int', but argument 3 has type 'const char *' [-Wformat]
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/config/udev.c b/config/udev.c
index 454838f..de89241 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -267,7 +267,7 @@ device_removed(struct udev_device *device)
 
         if (strncmp(sysname,"card", 4) != 0)
             return;
-        ErrorF("removing GPU device %s %d\n", syspath, path);
+        ErrorF("removing GPU device %s %s\n", syspath, path);
         if (!path)
             return;