diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 15:05:29 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 15:05:29 +0100 |
commit | 1f244ebbba650b82828b6139377d6199fe648d6b (patch) | |
tree | e2535977163606d0faabaea0658811e2899d8fa0 /pc-bios/efi-rtl8139.rom | |
parent | 73663d71ef2bab201475d58e17f0c7fe4baefb3f (diff) | |
parent | 18375b5c1655d3ce0c5029404a4c993ac04c9d09 (diff) |
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>
Diffstat (limited to 'pc-bios/efi-rtl8139.rom')
-rw-r--r-- | pc-bios/efi-rtl8139.rom | bin | 212480 -> 241664 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom Binary files differindex 83488cd54b..beb9301839 100644 --- a/pc-bios/efi-rtl8139.rom +++ b/pc-bios/efi-rtl8139.rom |