From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 20 Dec 2014 21:28:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-20141217-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c4e7c17a8ecb41cdbb81374a128161c614ba1f1e;p=qemu.git

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>
---

c4e7c17a8ecb41cdbb81374a128161c614ba1f1e