From: Richard Henderson <richard.henderson@linaro.org>
Date: Wed, 3 Nov 2021 15:24:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request... 
X-Git-Tag: v6.2.0-rc0~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c55e3370c359713ff1e2a3392f36978c629c20c8;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging

Trivial patches branch pull request 20211101 v2

# gpg: Signature made Tue 02 Nov 2021 07:21:44 PM EDT
# 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:
  hw/input/lasips2: Fix typos in function names
  MAINTAINERS: Split HPPA TCG vs HPPA machines/hardware
  hw/core/machine: Add the missing delimiter in cpu_slot_to_string()
  monitor: Trim some trailing space from human-readable output

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

c55e3370c359713ff1e2a3392f36978c629c20c8