xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit ac94cdb9df94dd26688de6d3d9143ac48f7b3c7b
Author: Julien Cristau <jcristau at debian.org>
Date:   Thu Jul 2 20:16:21 2015 +0200

    mi: fix typo in warning about overflowing queue
    
    Debian bug#726041
    
    Reported-by: Vincent Hobeïka <vincent.hobeika at gmail.com>
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/mi/mieq.c b/mi/mieq.c
index 8907a6e..b7be193 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -599,7 +599,7 @@ mieqProcessInputEvents(void)
         ErrorF("[mi] EQ processing has resumed after %lu dropped events.\n",
                (unsigned long) miEventQueue.dropped);
         ErrorF
-            ("[mi] This may be caused my a misbehaving driver monopolizing the server's resources.\n");
+            ("[mi] This may be caused by a misbehaving driver monopolizing the server's resources.\n");
         miEventQueue.dropped = 0;
     }