From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 15 May 2014 17:32:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-2' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=16a9189921bdb9e351f2f9baec16b376f8d71cdf;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-2' into staging

seabios: update to 1.7.5-rc1
ipxe: update to current git

# gpg: Signature made Thu 15 May 2014 13:29:37 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-roms-2:
  ipxe: update to current git
  seabios: update to 1.7.5-rc1

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

16a9189921bdb9e351f2f9baec16b376f8d71cdf