[PULL] Misc fixes

[Adam Jackson]

Just some stuff that's accumulated on the list and deserves merging,
all of which would be appropriate for a 1.17.2.

The following changes since commit b1029716e41e252f149b82124a149da180607c96:

  systemd-logind: don't second guess D-Bus default timeout (2015-04-17 10:57:48 -0700)

are available in the git repository at:

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

for you to fetch changes up to 7470578520e90b6402b2509cd0c51fd4fd84849f:

  shm: Fix xselinux resource initialization for xinerama pixmaps (2015-05-07 15:10:19 -0400)

----------------------------------------------------------------
Brent Collins (1):
      shm: Fix xselinux resource initialization for xinerama pixmaps

Chris Wilson (2):
      glx/dri2: Disable AIGLX if indirect GLX is disabled
      shm: Fix use-after-free in ShmDestroyPixmap

Jason Gerecke (1):
      xfree86: Return NULL from xf86CompatOutput if no compat_output is defined

Olivier Fourdan (1):
      dix: Fix image byte order on big endian hardware

Robert Ancell (1):
      xwayland: Fix error strings

 Xext/shm.c                    | 10 ++++++++--
 glx/glxdri2.c                 |  3 +++
 hw/xfree86/modes/xf86Crtc.h   |  2 ++
 hw/xwayland/xwayland-glamor.c |  4 ++--
 hw/xwayland/xwayland-input.c  |  2 +-
 hw/xwayland/xwayland-output.c |  4 ++--
 include/servermd.h            |  2 ++
 7 files changed, 20 insertions(+), 7 deletions(-)

- ajax