diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-28 11:28:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-28 11:28:44 +0100 |
| commit | 776f87845137a9b300a4815ba6bf6879310795aa (patch) | |
| tree | 66c4fe7ac2b183121d03e8dd3fe51dd02b08d425 /qapi-schema.json | |
| parent | 84a29c7efd02baa97b0d60d1e59e8357f7a5e0f1 (diff) | |
| parent | 226d007dbd75ec8d0f12d0f9e1ce66caf55d49e4 (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-07-27' into staging
trivial patches for 2015-07-27
# gpg: Signature made Mon Jul 27 20:50:14 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-07-27:
gdbstub: Set current CPU on interruptions
qapi: add missing @
Fix Cortex-A9 global timer
gitignore: Ignore shader generated files
vmstate: remove unused declaration
make: Clean build messages
qemu-common.h: Document cutils.c string functions
device_tree: Fix a typo
hw/acpi/ich9: clean up stale comment about KVM not supporting SMM
hw/acpi/ich9: clear smi_en on reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index a0a45f7d51..4342a08d30 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -15,7 +15,7 @@ { 'include': 'qapi/trace.json' } ## -# LostTickPolicy: +# @LostTickPolicy: # # Policy for handling lost ticks in timer devices. # |