]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/input-20180618-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 19 Jun 2018 13:34:06 +0000 (14:34 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 19 Jun 2018 13:34:06 +0000 (14:34 +0100)
commite8729c154b3fb97232e640a43c832122f0fdd32d
tree21ef492afe9db9fdf85788405667d62437736836
parent59926de9987ccdbeb65beb83974dd8f1756fcc62
parentb55a06df4f03f21e8a32e9d067a8a5782ac3ce0d
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>