pull req - prime pixmap fixes

[Dave Airlie]

The following changes since commit afa53fe7cffd430cf11f25ca818cb955a78c0c1c:

  Version 1.12.99.903 (1.13 RC3) (2012-07-25 14:29:48 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/xserver for-keithp

for you to fetch changes up to ac09a4a091a43188241365152e1244fd8fd93ee7:

  dri2: fix master pixmap free and reset pointer (2012-08-07 08:25:45 +1000)

----------------------------------------------------------------
Dave Airlie (3):
      pixmap: have slave pixmap take a reference on master pixmap
      dri2: free slave pixmap on app exit
      dri2: fix master pixmap free and reset pointer

 dix/pixmap.c           |    4 ++++
 hw/xfree86/dri2/dri2.c |    8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)