diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 11:41:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-14 11:41:24 +0100 |
| commit | 6fef22d7e650a5a7cad76c6115bea629e75eca9f (patch) | |
| tree | 7cc64e552e07503439d62462c851e60bc39fa2bc /scripts/simpletrace.py | |
| parent | b968316069abd00feb7a3bc9f4e32ed6c227ea65 (diff) | |
| parent | 69001917752fae95862db2d115cbf762afb0659c (diff) | |
| download | focaccia-qemu-6fef22d7e650a5a7cad76c6115bea629e75eca9f.tar.gz focaccia-qemu-6fef22d7e650a5a7cad76c6115bea629e75eca9f.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Lone typo fix (Thomas) # gpg: Signature made Mon 14 Aug 2017 09:41: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: qemu-doc: Fix "-net van" typo Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/simpletrace.py')
0 files changed, 0 insertions, 0 deletions