[PULL UPDATED] input fixes

[Peter Hutterer]

The following changes since commit 93d6ba5b711cbd3f502d83e54c9739856d2e6f2a:

  XQuartz: Make sure we tell startx the correct server binary to use in our fallback path (2012-04-26 21:25:38 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to f3410b97cf9b48a47bee3d15d232f8a88e75f4ef:

  dix: when disabling a device, release all buttons and keys (2012-05-01 11:36:36 +1000)

----------------------------------------------------------------
Chase Douglas (2):
      os: Add -displayfd option
      TouchListenerAcceptReject: Warn and return early on bad listener index

Michal Suchanek (2):
      xserver: Fix out-of-tree build
      dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN

Peter Hutterer (4):
      Xi: return BadValue on XIQueryVersion if the version is less than first call
      os: make timers signal-safe
      dix: don't emulate scroll events for non-existing axes (#47281)
      dix: when disabling a device, release all buttons and keys

 Xi/xiqueryversion.c                |   41 ++++++-------
 dix/devices.c                      |    1 +
 dix/getevents.c                    |    3 +
 dix/globals.c                      |    1 +
 dix/touch.c                        |    5 ++
 hw/dmx/dmxlog.c                    |   13 ++++-
 hw/dmx/dmxlog.h                    |   19 +++---
 include/opaque.h                   |    1 +
 man/Xserver.man                    |    7 +++
 os/WaitFor.c                       |   18 +++++-
 os/connection.c                    |   68 +++++++++++++++-------
 os/utils.c                         |    9 +++
 test/Makefile.am                   |    2 +-
 test/xi2/protocol-xiqueryversion.c |  113 ++++++++++++++++++++++++++++++++++++
 14 files changed, 248 insertions(+), 53 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120501/9265c7a1/attachment.pgp>