[PULL] two minor fixes

[Keith Packard]

Peter Hutterer <peter.hutterer at who-t.net> writes:

> Alan Coopersmith (1):
>       Check for calloc() failure in add_master()
>
> Peter Hutterer (1):
>       Xi: fix modifier offset in XIPassiveGrab swapping function

Merged.
   0fbb3d7..da1660d  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140127/7186908f/attachment.pgp>