| commit | 3334e929ae2d01e47c3e64757ee7fcf975cede94 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 10 Jun 2014 11:06:17 +0000 (10 12:06 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 10 Jun 2014 11:06:17 +0000 (10 12:06 +0100) | ||
| tree | e7e04900a51003b0b1af23213cc24336ff08707b | treesnapshot (tar.gz zip) |
| parent | 7b0140e49b1c239c880c90235548917086f53cdc | commitdiff |
| parent | 333cb18ff4aaf249b2e81a376bee2b15370f4784 | commitdiff |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140610-1' into staging
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>
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>