From: Peter Maydell Date: Mon, 4 Jul 2016 16:27:54 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20160704-3' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=11659423113d2fbcf055085b5e8285d590addfaa;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20160704-3' into staging Revert "bios: Add fast variant of SeaBIOS for use with -kernel on x86." # gpg: Signature made Mon 04 Jul 2016 16:24:55 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-seabios-20160704-3: Revert "bios: Add fast variant of SeaBIOS for use with -kernel on x86." Signed-off-by: Peter Maydell --- 11659423113d2fbcf055085b5e8285d590addfaa