From: Peter Maydell Date: Tue, 5 Jul 2016 11:46:18 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20160704-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=60a0f1af07d685c88f4ffa09370da5bd7514823e;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20160704-1' into staging ipxe: update submodule from 4e03af8ec to 041863191 e1000e+vmxnet3: add boot rom # gpg: Signature made Mon 04 Jul 2016 07:25:46 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/pull-ipxe-20160704-1: build: add pc-bios to config-host.mak deps ipxe: add new roms to BLOBS ipxe: update prebuilt binaries vmxnet3: add boot rom e1000e: add boot rom ipxe: add vmxnet3 rom ipxe: add e1000e rom ipxe: update submodule from 4e03af8ec to 041863191 Signed-off-by: Peter Maydell --- 60a0f1af07d685c88f4ffa09370da5bd7514823e