[PULL] Fix frozen device detection, run xmodmap after setting new keymap in XQuartz

[Jeremy Huddleston]

The following changes since commit 412c56ef3332d09efbd861e41c3e985f44729729:
  Maarten Maathuis (1):
        exa: remove some outdated comment

are available in the git repository at:

  git://anongit.freedesktop.org/~jeremyhu/xserver.git master

Jeremy Huddleston (2):
      XQuartz: Run xmodmap after programatically updating the keymap.
      dix: Properly detect if the other device is frozen

 dix/events.c                |    8 +++-----
 hw/xquartz/X11Application.m |    6 ++++++
 hw/xquartz/X11Controller.h  |    1 +
 hw/xquartz/quartzKeyboard.c |   23 +++++++++++++++++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5820 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-devel/attachments/20091104/9b423e3b/attachment-0001.bin