xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/common/xf86Events.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3420a7778c7d5eaa638327f31dd460554c257bb1
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Dec 12 11:02:19 2012 +1000

    xfree86: print message to the log when zapping the server
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 9dabf10..d8d4fad 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -180,6 +180,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
     switch (action) {
     case ACTION_TERMINATE:
         if (!xf86Info.dontZap) {
+            xf86Msg(X_INFO, "Server zapped. Shutting down.\n");
 #ifdef XFreeXDGA
             DGAShutdown();
 #endif