[PULL] input fixes Oct 4

[Peter Hutterer]

The following changes since commit 0b02150c27e98f996e10d7489f9f67a30e4e3497:

  dix: fix scale_to_desktop for edge ABS events (2012-09-24 11:12:04 -0700)

are available in the git repository at:

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

for you to fetch changes up to 7998e26159893674be69183a73a89a53f5608d58:

  Fix additional gcc -Wwrite-strings warning in xf86 ddx (2012-10-04 13:24:44 +1000)

----------------------------------------------------------------
Daniel Drake (1):
      Xi: Don't check for TOUCH_END, it's never set

Daniel Stone (1):
      Touch: Fix duplicate TouchBegin selection with virtual devices

Jason Gerecke (1):
      Fix additional gcc -Wwrite-strings warning in xf86 ddx

Peter Hutterer (2):
      dix: fix crash on XI 1.x grabs on disabled devices.  (#54934)
      mi: drop two useless conditions in miPointerSetPosition

 Xi/exevents.c                  | 2 --
 Xi/xiselectev.c                | 9 +++++++--
 dix/events.c                   | 9 ++++++---
 hw/xfree86/common/xf86Opt.h    | 2 +-
 hw/xfree86/common/xf86Option.c | 2 +-
 mi/mipointer.c                 | 5 -----
 6 files changed, 15 insertions(+), 14 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/20121004/13d327f0/attachment.pgp>