[PULL] 1.12 fix queue

[Keith Packard]

On Fri, 06 Jan 2012 14:49:38 -0500, Adam Jackson <ajax at nwnk.net> wrote:

> Adam Jackson (13):
>        os: Repack ConnectionOutput for LP64
>        dix: Repack ClientRec
>        dix: Pull client-is-local flag up to the ClientRec
>        dix: Extend initial connection handshake for forwarding proxies
>        os: Hide the Connection{In,Out}put implementation details
>        os: Minor header cleanup
>        dix: Fix types in WindowOptRec
>        xace: ricer tuning for XaceHook
>        dix: Tune dtrace hooks around Dispatch
>        dix: Tune dixLookupDrawable for success
>        xfree86: Remove the pretense of EDID v2 support
>        vgahw: Fix DACDelay() macro to use the driver's vtable
>        Always install xaa sdk headers
> 
> Arthur Taylor (1):
>        linux: Use K_OFF VT KB mode over K_RAW if available.
> 
> Chris Halse Rogers (2):
>        dix: Return BadWindow rather than BadMatch from dixLookupWindow
>        Revert "dix: don't return BadMatch from GetProperty (#23562)"
> 
> Matthieu Herrb (2):
>        UnloadSubModule(): accept pointer value '1' and ignore it.
>        Add OpenBSD support to DetermineClientCmd()
> 
> Pauli Nieminen (1):
>        shape: Report empty region correctly
> 
> Zhigang Gong (1):
>        mi/mibitblt: Fix an overflow bug of bit shift.

I've merged all of these except for 'shape: Report empty region
correctly', to which I replied to the original post (the correct fix is
in the Shape library, not the X server).
   0b2c649..f4956fa  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/20120109/3db8eaa9/attachment.pgp>