[PULL] xserver-next, 2011-03-08

[Jeremy Huddleston]

/facepalm fix applied to both 1.9 and 1.10:

   6666424..8ffaef2  server-1.9-branch -> server-1.9-branch
   3550396..0ab680f  server-1.10-branch -> server-1.10-branch


On Mar 9, 2011, at 15:23, Adam Jackson wrote:

> On 3/9/11 5:20 PM, Keith Packard wrote:
>> On Tue, 08 Mar 2011 13:52:45 -0500, Adam Jackson<ajax at nwnk.net>  wrote:
>> 
>>> Adam Jackson (14):
>>>       vbe: Fix malloc size bug
>>>       dix: Remove usage_hint from pixmaps, store it in ->drawable.class
>>>       dix: Remove deprecated.c
>>>       dix: Remove PIXEL typedef
>>>       xv: Use RESTYPE where appropriate
>>>       xinerama: Use RESTYPE consistently
>>>       xvmc: Use RESTYPE consistently
>>>       xi: Use RESTYPE consistently
>>>       glx: Remove unused _glapi_get_proc_offset and friends
>>>       glx: unifdef SOLARIS_THREADS
>>>       glx: unifdef USE_XTHREADS
>>>       glx: unifdef BEOS_THREADS
>>>       glx: Simplify _glapi_check_multithread
>>>       glx: Remove unused _glapi_get_proc_name
>>> 
>>> Erkki Seppälä (1):
>>>       xfree86/common: Remove a configScreen leak when conf_screen is
>>>       NULL
>> 
>> Merged.
>>    628d16a..a19771e  master ->  master
> 
> Jeremy, please cherry-pick d8caa782009abf4dc17b945e325e83fda299a534 (the VBE fix above) to 1.9 branch.
> 
> - ajax
>