summary refs log tree commit diff stats
path: root/hw/misc/virt_ctrl.c
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2021-11-09 11:34:30 +0100
committerRichard Henderson <richard.henderson@linaro.org>2021-11-09 11:34:30 +0100
commit21cc2bda7fda39ba749da607d6db50f55354f1fb (patch)
treef85a97d8f16c058985f87beee9ef48df5a57fb7c /hw/misc/virt_ctrl.c
parent85549204552b624fe254831537e7a0f6450228b8 (diff)
parent66d96a1901b7d9cfdbc454d407710ca8bfb90947 (diff)
downloadfocaccia-qemu-21cc2bda7fda39ba749da607d6db50f55354f1fb.tar.gz
focaccia-qemu-21cc2bda7fda39ba749da607d6db50f55354f1fb.zip
Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging
Trivial branch patches pull request 20211109

# gpg: Signature made Tue 09 Nov 2021 10:12:04 AM CET
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]

* remotes/vivier/tags/trivial-branch-for-6.2-pull-request:
  docs/about/deprecated: Remove empty 'related binaries' section
  tests/qtest/virtio-net: fix hotplug test case
  meson: Fix 'interpretor' typo
  .mailmap: Fix more contributor entries
  hw/m68k: Fix typo in SPDX tag
  hmp: Add shortcut to stop command to match cont

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/misc/virt_ctrl.c')
-rw-r--r--hw/misc/virt_ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c
index 3552d7a09a..e75d1e7e17 100644
--- a/hw/misc/virt_ctrl.c
+++ b/hw/misc/virt_ctrl.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifer: GPL-2.0-or-later
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Virt system Controller
  */