From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 19 Jun 2018 13:34:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/input-20180618-pull-request' into... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e8729c154b3fb97232e640a43c832122f0fdd32d;p=people%2Fpauldu%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/input-20180618-pull-request' into staging

input: ps2 post_load fix.

# gpg: Signature made Mon 18 Jun 2018 11:18:30 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/input-20180618-pull-request:
  ps2: check PS2Queue wptr pointer in post_load routine

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

e8729c154b3fb97232e640a43c832122f0fdd32d