[PULL UPDATED] input fixes

[Keith Packard]

On Tue, 1 May 2012 11:43:33 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:

> Chase Douglas (2):
>       os: Add -displayfd option
>       TouchListenerAcceptReject: Warn and return early on bad listener index
> 
> Michal Suchanek (2):
>       xserver: Fix out-of-tree build
>       dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN
> 
> Peter Hutterer (4):
>       Xi: return BadValue on XIQueryVersion if the version is less than first call
>       os: make timers signal-safe
>       dix: don't emulate scroll events for non-existing axes (#47281)
>       dix: when disabling a device, release all buttons and keys

Merged.
    93d6ba5..f3410b9  master -> master

(sorry for not merging this in the previous pull request; adventures
with synaptics continue here)

-- 
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/20120430/b3720c45/attachment.pgp>