Commit on xserver 1.11 stable branch but not on master?

[Chase Douglas]

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?

-- Chase