From: Peter Maydell Date: Mon, 7 Apr 2014 11:48:34 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/spice/tags/pull-spice-6' into staging X-Git-Tag: v2.0.0-rc2~9 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lisovros/qemu_apohw.git/commitdiff_plain/bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8 Merge remote-tracking branch 'remotes/spice/tags/pull-spice-6' into staging 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/spice/tags/pull-spice-6: spice: monitors_config: check pointer before dereferencing Signed-off-by: Peter Maydell --- bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8