]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-6' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 7 Apr 2014 11:48:34 +0000 (12:48 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 7 Apr 2014 11:48:34 +0000 (12:48 +0100)
spice: monitors_config: check pointer before dereferencing

# gpg: Signature made Mon 07 Apr 2014 11:19:19 BST using RSA key ID D3E87138
# 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>"

* remotes/spice/tags/pull-spice-6:
  spice: monitors_config: check pointer before dereferencing

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

Trivial merge