[PULL] XQuartz issues exposed by OS X 10.7.5 and 10.8.2

[Jeremy Huddleston Sequoia]

The following changes since commit d01921ec18c21f21d377b60626cc2d3418b84a7c:

  Merge remote-tracking branch 'ajax/ioperm' (2012-09-20 17:26:48 +0200)

are available in the git repository at:


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

for you to fetch changes up to a55ccb7e8f80992e985694a5ec40b5aa72526d39:

  XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced (2012-09-20 22:02:53 -0700)

----------------------------------------------------------------
Jeremy Huddleston Sequoia (2):
      XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2
      XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced

 hw/xquartz/xpr/dri.c      |  6 ++++++
 hw/xquartz/xpr/xprFrame.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)