[PULL] -next branch for 1.11

[Peter Hutterer]

A number of fixes I've had lingering in my next branch.

Cheers,
  Peter

The following changes since commit f3d19c0cf3327cceb90f7378f5d8fc0c3e327400:

  Version bumped to 1.10 (2011-02-25 21:25:58 -0800)

are available in the git repository at:
  git://people.freedesktop.org/~whot/xserver.git for-keith

Adam Jackson (1):
      xext: Remove XCALIBRATE extension

Alan Coopersmith (4):
      xkb: Use snprintf to measure string lengths instead of manual strlen math
      Replace _XkbDupString with Xstrdup
      XkbAddGeomProperty: Fix checks for malloc failure
      xkb: Replace malloc(strlen) + strcpy with strdup

Bryce Harrington (1):
      Check for OOM condition in XISendDeviceHierarchyEvent

Daniel Stone (6):
      Input: Store passive-activating key in CheckDeviceGrabs
      Input: Actually send Xi 1.x DeviceStateNotify events
      Input: Rename EventIsDeliverable return masks
      Input: Reduce use of filter in DeliverEvents
      Input: Allow EventToCore to return multiple events
      Input: Don't freeze unrelated devices in DeliverGrabbedEvent

Matthieu Herrb (1):
      Don't clobber input device options from xorg.conf

Peter Hutterer (24):
      mi: remove static GenerateEvent variable.
      mi: Add a few comments explaining various cursor move functions.
      mi: remove if 0 code.
      mi: simplify a "check for keyboard" condition
      dix: replace direct master access with GetMaster and temp. device.
      Fix two incorrect checks for master devices.
      dix: Simplify retrieving the master device.
      dix: Add IsFloating(device) wrapper.
      xfree86: replace two inputInfo.pointer uses with device loops.
      Switch to use IsFloating()
      dix: add MASTER_ATTACHED as allowed type for GetMaster().
      Xi: replace a direct master access with GetMaster()
      dix: fix up a master check in ChangeKeyboardMapping handling.
      dix: fix a master device access in change_modmap.
      xfree86:  update GetMaster check for the VCP.
      mi: update macro to search for MASTER_POINTER
      mi: check for MASTER_POINTER instead of manual checks.
      xkb: Fix a check for MASTER_KEYBOARD
      input: Change a bunch of direct dev->u.master accesses to use GetMaster()
      Move master/lastSlave out of the union into separate fields.
      Merge branch 'mi-cleanup' into next
      include: document list interface.
      dix: release all buttons and keys before reattaching a device (#34182)
      Merge branch 'next' into for-keith

Simon Thum (4):
      fix percent options parsing
      xfree86: allow to check for options without warnings in the log
      dix: refactor scheme init
      dix: avoid FP promotion during pointer acceleration

 Xext/Makefile.am                   |    7 -
 Xext/xcalibrate.c                  |  297 ------------------------------------
 Xi/exevents.c                      |   19 ++-
 Xi/xichangehierarchy.c             |    6 +-
 Xi/xipassivegrab.c                 |   10 +-
 Xi/xiquerydevice.c                 |    4 +-
 Xi/xiquerypointer.c                |    2 +-
 Xi/xiwarppointer.c                 |    2 +-
 configure.ac                       |   10 --
 dix/devices.c                      |  134 ++++++++++-------
 dix/eventconvert.c                 |   37 ++++-
 dix/events.c                       |  177 +++++++++++++---------
 dix/getevents.c                    |   15 +-
 dix/inpututils.c                   |    8 +-
 dix/ptrveloc.c                     |   42 ++++--
 hw/xfree86/common/xf86Config.c     |    6 +-
 hw/xfree86/common/xf86Option.c     |   77 ++++++----
 hw/xfree86/common/xf86RandR.c      |   37 ++++-
 hw/xfree86/modes/xf86RandR12.c     |   36 ++++-
 hw/xfree86/ramdac/xf86Cursor.c     |    6 +-
 include/dix.h                      |    1 +
 include/eventconvert.h             |    2 +-
 include/input.h                    |   16 ++-
 include/inputstr.h                 |    8 +-
 include/list.h                     |  182 ++++++++++++++++++++++-
 include/protocol-versions.h        |    4 -
 include/ptrveloc.h                 |   10 +-
 include/xkbsrv.h                   |    4 -
 mi/midispcur.c                     |    2 +-
 mi/mieq.c                          |   18 ++-
 mi/mipointer.c                     |  196 ++++++++++++++++++------
 mi/mipointrst.h                    |    1 +
 mi/misprite.c                      |   16 +-
 record/record.c                    |    9 +-
 test/input.c                       |   68 +++++----
 test/xi2/protocol-xiquerypointer.c |    2 +-
 test/xi2/protocol-xiwarppointer.c  |    2 +-
 xkb/XKBGAlloc.c                    |   17 +--
 xkb/ddxLoad.c                      |   21 ++--
 xkb/maprules.c                     |   33 ++--
 xkb/xkb.c                          |   18 +--
 xkb/xkbAccessX.c                   |    2 +-
 xkb/xkbActions.c                   |    8 +-
 xkb/xkbInit.c                      |   20 ++--
 xkb/xkbfmisc.c                     |   10 +-
 xkb/xkmread.c                      |   21 +--
 46 files changed, 874 insertions(+), 749 deletions(-)
 delete mode 100644 Xext/xcalibrate.c