From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 17 Jul 2017 14:05:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ipxe-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1f244ebbba650b82828b6139377d6199fe648d6b;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/ipxe-pull-request' into staging

Pull request

# gpg: Signature made Mon 17 Jul 2017 10:04:11 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ipxe-pull-request:
  ipxe: update to commit 0600d3ae94

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

1f244ebbba650b82828b6139377d6199fe648d6b