[PULL updated] input fixes, drm hack revert

[Peter Hutterer]

The following changes since commit ecf62755086fd65898998d5a509aee5f29a9583d:

  Define prototypes for hw/xfree86/modes/xf86Modes.c only in xf86Modes.h. (2013-04-08 09:19:34 -0700)

are available in the git repository at:

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

for you to fetch changes up to 98b94c36d6b1d286bbd4cb414e54b4b95a1484b0:

  dix: copy event in TouchConvertToPointerEvent correctly (2013-04-16 07:32:42 +1000)

----------------------------------------------------------------
Bryce Harrington (1):
      xfree86: Revert workaround for drm race condition.

Keith Packard (1):
      Xi: Use correct destination when swapping barrier events

Knut Petersen (1):
      Never try to execute BellProcPtr NULL.

Maarten Lankhorst (2):
      Xi: Do not handle ET_TouchOwnership in ProcessTouchEvent
      dix: copy event in TouchConvertToPointerEvent correctly

Peter Hutterer (2):
      dix: don't set non-exisiting flags on touch events
      xfree86: change a log message

Rui Matos (1):
      Xi: fix swapped grab mode args for keyboard devices in XIGrabDevice

 Xi/devbell.c                               |  3 ++-
 Xi/exevents.c                              | 42 ++++++++++++++++--------------
 Xi/extinit.c                               | 36 ++++++++++++-------------
 Xi/xigrabdev.c                             | 15 +++++++++--
 dix/eventconvert.c                         | 19 +++++++-------
 dix/touch.c                                |  4 +--
 hw/xfree86/os-support/linux/lnx_platform.c | 33 +++++------------------
 7 files changed, 74 insertions(+), 78 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/20130416/08f9ad96/attachment.pgp>