[PULL] screensaver/dpms fix, sysconfigdir, pointer accel revert

[Keith Packard]

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

> Keith,
>
> Please pull the changes below. The revert explains itself in the commit
> message but the long story short here is that it doesn't work for all
> devices and fixing it in a sane manner requires lockstep between the server
> and synaptics. That requires an ABI bump and given how close we are to the
> release I prefer to just restore the previous behaviour and fix this up in a
> set of patches as follow-up.

Sounds good. Note that we're now T-2 days to the release.

> Aaron Plattner (1):
>       xfree86: Only support one sysconfigdir
>
> Peter Hutterer (3):
>       os: prevent negative array index access (#80890)
>       xfree86: don't force the screensaver off on DPMS unblank, merely suggest it
>       Revert "dix: fix up coordinate scaling when external monitors are present"

Merged.
   9de3cc8..9a19bf0  master -> master

I'm waiting for the odev stuff, but have nothing else pending for
1.16.

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