From: Peter Maydell Date: Fri, 20 Mar 2015 12:26:09 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3c6c9fe034c0c07b77f272e4a53d7735220a16a4;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging X86 queue 2015-03-19 # gpg: Signature made Thu Mar 19 19:40:17 2015 GMT using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-pull-request: target-i386: Haswell-noTSX and Broadwell-noTSX Revert "target-i386: Disable HLE and RTM on Haswell & Broadwell" Signed-off-by: Peter Maydell --- 3c6c9fe034c0c07b77f272e4a53d7735220a16a4