git pull: glx + build fix

[Keith Packard]

Dave Airlie <airlied at gmail.com> writes:

> 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

Merged.
   ea74e38..d5977e5  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120712/74f7e3ab/attachment.pgp>