diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-09 11:34:30 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-09 11:34:30 +0100 |
| commit | 21cc2bda7fda39ba749da607d6db50f55354f1fb (patch) | |
| tree | f85a97d8f16c058985f87beee9ef48df5a57fb7c /hw | |
| parent | 85549204552b624fe254831537e7a0f6450228b8 (diff) | |
| parent | 66d96a1901b7d9cfdbc454d407710ca8bfb90947 (diff) | |
| download | qemu-21cc2bda7fda39ba749da607d6db50f55354f1fb.zip qemu-21cc2bda7fda39ba749da607d6db50f55354f1fb.tar.gz qemu-21cc2bda7fda39ba749da607d6db50f55354f1fb.tar.bz2 | |
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')
| -rw-r--r-- | hw/char/goldfish_tty.c | 2 | ||||
| -rw-r--r-- | hw/intc/goldfish_pic.c | 2 | ||||
| -rw-r--r-- | hw/intc/m68k_irqc.c | 2 | ||||
| -rw-r--r-- | hw/m68k/virt.c | 2 | ||||
| -rw-r--r-- | hw/misc/virt_ctrl.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c index 8365a18..20b7788 100644 --- a/hw/char/goldfish_tty.c +++ b/hw/char/goldfish_tty.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Goldfish TTY * diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c index e3b43a6..dfd5327 100644 --- a/hw/intc/goldfish_pic.c +++ b/hw/intc/goldfish_pic.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Goldfish PIC * diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index 2133d2a..0c515e4 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * QEMU Motorola 680x0 IRQ Controller * diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 4e8bce5..edc58fb 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * QEMU Vitual M68K Machine * diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c index 3552d7a..e75d1e7 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 */ |