xserver: Branch 'master' - 10 commits

[Keith Packard]

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

> with that, Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Merged (in two patches, sorry for the typo!)

-- 
-keith
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20160529/42560970/attachment.sig>