[PULL] two minor fixes

[Peter Hutterer]

The following changes since commit c1ce807d9f18f215332d7eeb844e8c640f71c53c:

  dix: Praise clients which haven't run for a while, rather than idle clients (2014-01-23 10:10:28 -0800)

are available in the git repository at:

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

for you to fetch changes up to 9fc19168e7ca6308275bf8769d1ccb982f88465b:

  Check for calloc() failure in add_master() (2014-01-25 18:54:16 +1000)

----------------------------------------------------------------
Alan Coopersmith (1):
      Check for calloc() failure in add_master()

Peter Hutterer (1):
      Xi: fix modifier offset in XIPassiveGrab swapping function

 Xi/xichangehierarchy.c                  | 4 ++++
 Xi/xipassivegrab.c                      | 2 +-
 test/xi2/protocol-xipassivegrabdevice.c | 9 ++++++++-
 3 files changed, 13 insertions(+), 2 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/20140128/8c4a327e/attachment.pgp>