summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-09-22 19:22:23 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-22 19:22:23 +0100
commit27c7275a56948f48f536e2d1599b22355f5714ac (patch)
tree6e0771daa335d70a0c42e08e44805e15449fdd57 /Makefile
parent482d7c0854423608e20e56b5824b7340bd3af7df (diff)
parentf4798320144245da66128edb840bd940fd287d28 (diff)
downloadqemu-27c7275a56948f48f536e2d1599b22355f5714ac.tar.gz
qemu-27c7275a56948f48f536e2d1599b22355f5714ac.tar.bz2
qemu-27c7275a56948f48f536e2d1599b22355f5714ac.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20150903-1' into staging
ipxe: update to 35c53797 to 4e03af8, build tweaks. # gpg: Signature made Thu 03 Sep 2015 13:52:01 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-ipxe-20150903-1: ipxe: update binaries ipxe: use upstream configuration ipxe: don't override GITVERSION ipxe: update from 35c53797 to 4e03af8 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions