summary refs log tree commit diff stats
path: root/scripts/qemugdb
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-04-06 09:27:49 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-04-06 09:27:49 +0100
commit54d689988c847271d87b3eb113712147129fb811 (patch)
tree29698f0c769de5fa61fcc61a98c20a5701571861 /scripts/qemugdb
parent1fde6ee885d3e778acb326cab9f7037939839537 (diff)
parent8c9f42f3cf3598e8bb612b3f81cd12632efd3ca4 (diff)
downloadfocaccia-qemu-54d689988c847271d87b3eb113712147129fb811.tar.gz
focaccia-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/qemugdb')
0 files changed, 0 insertions, 0 deletions