[PULL] button mapping fix and unconstify patches

[Peter Hutterer]

The following changes since commit 83e38eb73fd8c852513aac2da2975b4c01070ec2:

  edid: Add quirk for Sony Vaio Pro 13 (2014-01-30 16:27:59 -0800)

are available in the git repository at:

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

for you to fetch changes up to 2ee2f1edc5b0954c7bf8fc4793bbb5f180a4b3fa:

  dix: fix button state check before changing a button mapping (2014-02-05 07:13:03 +1000)

----------------------------------------------------------------
Peter Hutterer (10):
      Xi: remove superfluous cast.
      xkb: add a call to init an XkbRMLVOSet from const chars
      input: un-constify InputAttributes
      Revert "os: xstrtokenize takes and returns const char * now"
      input: un-constify dev->name
      Revert "xfree86/parser: make strings in xf86MatchGroup const"
      Revert "xfree86/common: handle string constants in xf86Xinput configuration"
      dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS
      include: make the various button array lengths more obious
      dix: fix button state check before changing a button mapping

 Xi/extinit.c                   |  4 +--
 Xi/listdev.c                   |  2 +-
 config/udev.c                  | 14 +++++------
 dix/devices.c                  |  3 ++-
 dix/getevents.c                |  2 ++
 dix/inpututils.c               | 19 +++++++-------
 hw/xfree86/common/xf86Config.c | 16 ++++++------
 hw/xfree86/common/xf86Xinput.c |  4 +--
 hw/xfree86/parser/InputClass.c | 24 +++++++++---------
 hw/xfree86/parser/xf86Parser.h |  2 +-
 include/input.h                | 16 ++++++------
 include/inputstr.h             |  2 +-
 include/misc.h                 |  2 +-
 include/xkbrules.h             | 10 ++++----
 include/xkbsrv.h               |  8 ++++++
 os/utils.c                     |  6 ++---
 test/input.c                   | 56 ++++++++++++++++++++++--------------------
 test/touch.c                   | 20 +++++++++++----
 test/xkb.c                     | 18 ++++++++------
 xkb/xkbInit.c                  | 25 +++++++++++++++----
 20 files changed, 149 insertions(+), 104 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140205/42c3e9d3/attachment.pgp>