Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140610-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 10 Jun 2014 11:06:17 +0000 (12:06 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 10 Jun 2014 11:06:17 +0000 (12:06 +0100)
console: two little bugfixes.

# gpg: Signature made Tue 10 Jun 2014 12:01:07 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/kraxel/tags/pull-console-20140610-1:
  console: fix -vga none -sdl crash
  console: kill MAX_CONSOLES, alloc consoles dynamically

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

Trivial merge