git pull: glx + build fix

[Dave Airlie]

Hi Keith,

the GLX fixes are all for building against mesa master, the platform
bus fix is unreviewed, but please smash an r-b on it, its trivial, but
Fedora won't build the server with implicit declarations.

Dave.

The following changes since commit ea74e381ae91f45ec195a5505262e2e5a3c0e1c9:

  xtest: add extinit.h for SyncExtensionInit (2012-07-12 15:16:23 -0700)

are available in the git repository at:

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

for you to fetch changes up to 0bf5bfd87d291383050dba07f907bd464113355d:

  xf86: include xf86platformBus.h in xf86AutoConfig.c (2012-07-13
11:25:04 +1000)

----------------------------------------------------------------
Bartosz Brachaczek (1):
      glx: Fix checking GL version

Dave Airlie (6):
      glx: pass screen into the convert function
      glx/dri2: fix typo in the notification reset for robustness.
      glx/dri2: fix incorrect == vs =
      glx/dri2: use correct define from dri attribs.
      glx/dri2: don't return NULL in a function with no return.
      xf86: include xf86platformBus.h in xf86AutoConfig.c

 glx/glxdri2.c                      |   15 ++++++++-------
 hw/xfree86/common/xf86AutoConfig.c |    1 +
 2 files changed, 9 insertions(+), 7 deletions(-)