summaryrefslogtreecommitdiffstats
path: root/hw/ide
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-20 12:26:09 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-20 12:26:09 +0000
commit3c6c9fe034c0c07b77f272e4a53d7735220a16a4 (patch)
tree737223f0a5d761f923c5f4b6e1bb666e93eaa622 /hw/ide
parent4eef86486d4090d7587e94d3f1a2203b94899989 (diff)
parenta356850b80b3d13b2ef737dad2acb05e6da03753 (diff)
downloadhqemu-3c6c9fe034c0c07b77f272e4a53d7735220a16a4.zip
hqemu-3c6c9fe034c0c07b77f272e4a53d7735220a16a4.tar.gz
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 <ehabkost@redhat.com>" # 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 <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud