[PULL] build fix, bug fix, warning fixes

[Keith Packard]

Peter Hutterer <peter.hutterer at who-t.net> writes:

> Peter Hutterer (9):
>       test: fix "redundant declaration of devices" warning
>       test: fix "userdata shadows global declaration" warnings
>       test: fix redundant declaration of "BadDevice"
>       test: don't shadow parameter 'len'
>       include: don't redeclare device events in xkbsrv.h
>       dix: undo transformation for missing valuators (#49347)
>       dix: Move DeviceFocusEvent from Xi into enterleave.c
>       Xi: fix "shadows previous local" warnings
>       Xi: fix "discards ''const' qualifier" warnings
>
> Simon Thum (1):
>       dix: indentation fixes for pointer acceleration

Merged.
   3117456..ae1c48e  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/20120517/dd9e1e46/attachment-0001.pgp>