Commit on xserver 1.11 stable branch but not on master?

[Peter Hutterer]

On Sat, Feb 11, 2012 at 12:01:47AM +0100, Chase Douglas wrote:
> Peter,
> 
> While updating our frankenserver (1.11 stable + 1.12 input) I came
> across this commit on server-1.11-stable branch:
> 
> 4b386610243b1a30db7e4cdb89cb43012198407d dix: button state must show the
> logical buttons, not physical buttons
> 
> It says it's cherry-picked from
> 9567d21e85b99febe805263a4d93b15fd1f7ab42, but I can't find that on the
> master branch, and the code change doesn't appear to be there either. Do
> you know what happened here?

hmm, I wonder if it got rebased after I cherry-picked. not good. The
upstream commit appears to be fcda98c48610fd507ca0b89c6006a5497d9dc1c9, I've
added that to the bug now too.

Cheers,
  Peter