summary refs log tree commit diff stats
path: root/hw/net/cadence_gem.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-06-10 12:06:17 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-06-10 12:06:17 +0100
commit3334e929ae2d01e47c3e64757ee7fcf975cede94 (patch)
treee7e04900a51003b0b1af23213cc24336ff08707b /hw/net/cadence_gem.c
parent7b0140e49b1c239c880c90235548917086f53cdc (diff)
parent333cb18ff4aaf249b2e81a376bee2b15370f4784 (diff)
downloadfocaccia-qemu-3334e929ae2d01e47c3e64757ee7fcf975cede94.tar.gz
focaccia-qemu-3334e929ae2d01e47c3e64757ee7fcf975cede94.zip
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>
Diffstat (limited to 'hw/net/cadence_gem.c')
0 files changed, 0 insertions, 0 deletions