[PULL] AEI removal, XInput crasher, cleanups

[Keith Packard]

On Thu, 11 Nov 2010 10:33:56 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:

> Cyril Brulebois (4):
>       Remove superfluous if(p!=NULL) checks around free(p); p=NULL;
>       Remove more superfluous if(p) checks around free(p).
>       Remove more superfluous if(p!=NULL) checks around free(p).
>       Remove more superfluous if(p!=NULL) checks around free(p).
> 
> Julien Cristau (1):
>       os: include dix-config.h, not xorg-config.h
> 
> Peter Hutterer (8):
>       xfree86: remove two unused variables from Makefile.am
>       xfree86: fix two compiler warnings - unused variable ati, atimisc
>       xfree86: fix compiler warnings - unused variable i
>       Xi: split hierarchy manipulation into static functions.
>       Xi: rename two variables from ptr to dev.
>       Xi: if XTEST device creation fails, fail the master devices.
>       config: remove mention of AllowEmptyInput
>       xfree86: remove user-configured AllowEmptyInput

Mmm. Chocolate. Merged.
   291c39d..4ed4915  master -> master

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