[PULL] misc input patches

[Peter Hutterer]

Egbert's patch fixes a (rare) case if two XI1 clients grab for a 
button on the same device (that's only the first of the two patches at this
point).

Rest is misc, but the 68554 fix is quite important.

The following changes since commit e01a3f65d3e6d92f92ef2992b338cc9625bde082:

  ephyr: Fix warning about XID vs unsigned long * by changing function args (2013-08-21 09:10:49 -0700)

are available in the git repository at:

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

for you to fetch changes up to 94d4e29aedc69431fa9b299ca1b67947173d7a24:

  Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554) (2013-08-30 14:26:55 +1000)

----------------------------------------------------------------
Egbert Eich (1):
      DIX/Xi: Pass correct client to CheckDeviceGrabAndHintWindow()

Peter Hutterer (5):
      test: fix the gcc diagnostics pragma
      include: wrap EMASKSIZE in parentheses
      Xi: replace loop with memset
      dix: check for grab type before checking XI2 mask
      Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554)

 Xi/grabdev.c          |  5 +----
 Xi/xiallowev.c        |  2 +-
 dix/events.c          | 25 +++++++++++++++++--------
 include/inputstr.h    |  2 +-
 test/signal-logging.c |  3 ++-
 5 files changed, 22 insertions(+), 15 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/20130830/46fd0fde/attachment.pgp>