]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
projects / thirdparty / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adee642 c246cee)
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)
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>

Trivial merge
Mirror of https://git.qemu.org/git/qemu.git