projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba43bc2 d880b28)
Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-2' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 15 May 2014 17:32:16 +0000 (18:32 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 15 May 2014 17:32:16 +0000 (18:32 +0100)
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>

Trivial merge
Domain: SDK / Emulator;