diff options
| author | Peter Maydell | 2017-04-06 10:27:49 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-04-06 10:27:49 +0200 |
| commit | 54d689988c847271d87b3eb113712147129fb811 (patch) | |
| tree | 29698f0c769de5fa61fcc61a98c20a5701571861 /scripts | |
| parent | Update version for v2.9.0-rc3 release (diff) | |
| parent | tco: do not generate an NMI (diff) | |
| download | qemu-54d689988c847271d87b3eb113712147129fb811.tar.gz qemu-54d689988c847271d87b3eb113712147129fb811.tar.xz qemu-54d689988c847271d87b3eb113712147129fb811.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* TCO watchdog fix
# gpg: Signature made Wed 05 Apr 2017 16:24:52 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
tco: do not generate an NMI
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions