[PULL] 1.10: warning fixes, ABI fix, and minor Fedora merge

[ajax at redhat.com]

The following changes since commit 93a73993708b1345c86ec3ec06b02ed236595673:

  test: write some event → XI1 conversion tests. (2011-02-22 08:08:55 +1000)

are available in the git repository at:
  ssh://people.freedesktop.org/~ajax/xserver for-keithp

Adam Jackson (13):
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      glxproxy: warning fix
      xfree86: If the driver found modes on an output, don't add more
      xfree86: Fix the sdk headers to be multilib-safe

Peter Hutterer (1):
      Add mode field to ConstrainCursorHarder

 hw/dmx/glxProxy/glxcmds.c     |   80 +++++++++++++++++-----------------------
 hw/dmx/glxProxy/glxsingle.c   |    7 ++--
 hw/dmx/glxProxy/glxvendor.c   |    6 ++--
 hw/dmx/glxProxy/render2swap.c |   54 ---------------------------
 hw/xfree86/modes/xf86Crtc.c   |   10 +++++-
 include/colormapst.h          |    4 +-
 include/scrnintstr.h          |    2 +-
 include/xorg-server.h.in      |    7 ++--
 8 files changed, 57 insertions(+), 113 deletions(-)