diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-03 11:24:09 -0400 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-03 11:24:09 -0400 |
| commit | c55e3370c359713ff1e2a3392f36978c629c20c8 (patch) | |
| tree | 33de54c03d09e33ff830e7437b5e4d0a86b53616 /MAINTAINERS | |
| parent | cc23377516072d293b0f9ab04741f8982d274639 (diff) | |
| parent | 5d2bd73588d14b5868129ace9c7912a777f06753 (diff) | |
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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7cbae14422..c0d1518e0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -211,10 +211,7 @@ HPPA (PA-RISC) TCG CPUs M: Richard Henderson <richard.henderson@linaro.org> S: Maintained F: target/hppa/ -F: hw/hppa/ F: disas/hppa.c -F: hw/net/*i82596* -F: include/hw/net/lasi_82596.h M68K TCG CPUs M: Laurent Vivier <laurent@vivier.eu> @@ -1095,6 +1092,8 @@ R: Helge Deller <deller@gmx.de> S: Odd Fixes F: configs/devices/hppa-softmmu/default.mak F: hw/hppa/ +F: hw/net/*i82596* +F: include/hw/net/lasi_82596.h F: pc-bios/hppa-firmware.img M68K Machines |