xserver: Branch 'server-1.11-branch' - 2 commits

[Jeremy Huddleston]

 Xi/xichangehierarchy.c |   13 -------------
 configure.ac           |    4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit cea9f9f273cb525cb5daa2d2819d3f635582cb24
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Jan 6 22:01:03 2012 -0800

    configure.ac: 1.11.3.901 (1.11.4 RC1)
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index a871529..fdaa583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.11.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-12-16"
+AC_INIT([xorg-server], 1.11.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-01-06"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit b15be8547d4d204f3e498f52d86713a76766e871
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Jan 6 22:12:14 2012 -0800

    Xi: Fix mishandled git merge
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index 4a15d5c..3facadd 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -216,19 +216,6 @@ disable_clientpointer(DeviceIntPtr dev)
 }
 
 static int
-disable_clientpointer(DeviceIntPtr dev)
-{
-    int i;
-
-    for (i = 0; i < currentMaxClients; i++)
-    {
-        ClientPtr client = clients[i];
-        if (client && client->clientPtr == dev)
-            client->clientPtr = NULL;
-    }
-}
-
-static int
 remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
               int flags[MAXDEVICES])
 {