]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-20141217-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sat, 20 Dec 2014 21:28:53 +0000 (21:28 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 20 Dec 2014 21:28:53 +0000 (21:28 +0000)
commitc4e7c17a8ecb41cdbb81374a128161c614ba1f1e
tree19c75f66dcebbe377244551bec2303c8f4e0332f
parentadee64249ee37e822d578e65a765750e7f2081f6
parentc246cee4eedb17ae3932d699e009a8b63240235f
Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-20141217-1' into staging

update ipxe from 69313ed to 35c5379

# gpg: Signature made Wed 17 Dec 2014 14:45:04 GMT 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-20141217-1:
  update ipxe from 69313ed to 35c5379

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