From: Peter Maydell Date: Mon, 29 Sep 2014 18:28:15 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140929-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=70d3a7a7b8340d9f671c5aec4c6dd174fee2ef8e;p=qemu.git Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140929-1' into staging add and use graphic_console_set_hwops # gpg: Signature made Mon 29 Sep 2014 11:18:37 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-20140929-1: qxl: use graphic_console_set_hwops console: add graphic_console_set_hwops Signed-off-by: Peter Maydell --- 70d3a7a7b8340d9f671c5aec4c6dd174fee2ef8e