[PULL] GLX fixes and etc.

[Adam Jackson]

On Mon, 2013-11-18 at 10:21 -0800, Keith Packard wrote:

> I don't have the 'Remove current context cache' or 'Remove isWindow from
> the DamageRec' patches, but the remaining changes have been merged, at
> least as far as I can tell.
> 
> We'll pend the 'isWindow' change until after 1.15, but should the
> context cache change get merged?

Let me revisit that.  I think I wanted to wait on that until glamor was
merged since I think it's actually a lockstep change, but I've paged out
the details atm.

- ajax