[PULL] hw/xwin fixes + a warning fix

[Keith Packard]

On Fri, 27 Jan 2012 12:02:21 +0000, Jon TURNEY <jon.turney at dronecode.org.uk> wrote:

> I have amended that patch as suggested by Peter and re-pushed my
> branch.

Merged.
   02775ef..8e78bbb  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/20120127/f9b1a656/attachment.pgp>