xserver: Branch 'master'

[Adam Jackson]

 mi/mieq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc57ab4fc8b9dc15531f0dd9f5b352fa99a80cd0
Author: Andy Ritger <aritger at nvidia.com>
Date:   Wed Jun 20 11:52:33 2012 -0700

    Remove static qualifier on mieqProcessInputEvents()'s 'event'
    
    This isn't necessary.
    
    Signed-off-by: Andy Ritger <aritger at nvidia.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/mi/mieq.c b/mi/mieq.c
index b7be193..f7d8721 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -576,7 +576,7 @@ mieqProcessInputEvents(void)
 {
     EventRec *e = NULL;
     ScreenPtr screen;
-    static InternalEvent event;
+    InternalEvent event;
     DeviceIntPtr dev = NULL, master = NULL;
     size_t n_enqueued;