[PULL] FIx series for 1.15

[Adam Jackson]

Previous series included, plus IRC r-b's from Keith, plus a paranoia fix
for CreateNewResourceType failing in the Xinerama Damage case.

The following changes since commit ac772cb187ddf7e04b8f4b3a071b90f18f4488d0:

  glx: Fix incorrect use of dri_interface.h version defines in driver probing. (2013-12-05 10:51:01 -0800)

are available in the git repository at:

  ssh://people.freedesktop.org/~ajax/xserver.git xserver-next

for you to fetch changes up to 576f3d36dd324bd0d16c9968f1ded5c5eead3569:

  damageext: Die if we can't create the Xinerama resource type (2013-12-09 13:20:37 -0500)

----------------------------------------------------------------
Adam Jackson (14):
      present: Disable when Xinerama is active
      dri2: Disable when Xinerama is active
      dri3: Disable when Xinerama is active
      smartsched: Tweak the default scheduler intervals
      bs: Set the screen's bs support level to WhenMapped
      composite: Automatically enable backing store support on the screen
      composite: Don't double-redirect if someone asks for backing store twice
      xfree86: Prefer fbdev to vesa
      xinerama: Export the screen region
      composite: Fix COW creation for Xinerama (v2)
      fixes: Fix PanoramiXSetPictureClipRegion for root windows (v2)
      fixes: Fix PanoramiXSetWindowShapeRegion for root windows (v2)
      damageext: Xineramify (v7)
      damageext: Die if we can't create the Xinerama resource type

 Xext/panoramiX.c                   |   5 +-
 Xext/panoramiXsrv.h                |   1 +
 composite/compinit.c               |   7 +-
 composite/compoverlay.c            |   5 +-
 damageext/damageext.c              | 389 ++++++++++++++++++++++++++++++++-----
 damageext/damageextint.h           |   3 +
 dix/dispatch.c                     |   5 +-
 dix/window.c                       |   6 +-
 dri3/dri3.c                        |   5 +
 hw/xfree86/common/xf86AutoConfig.c |  17 +-
 hw/xfree86/common/xf86Config.c     |   2 +-
 hw/xfree86/common/xf86Helper.c     |   7 +-
 hw/xfree86/dri2/dri2ext.c          |   5 +
 present/present_screen.c           |   5 +
 xfixes/region.c                    |  26 +++
 15 files changed, 419 insertions(+), 69 deletions(-)

- ajax