diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-02 17:59:03 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-02 17:59:03 +0000 |
| commit | 36609b4fa36f0ac934874371874416f7533a5408 (patch) | |
| tree | 5a82ce043b4ce044e1f94f92835722888056c49e | |
| parent | 2bf2ee1b7c42251a3400084cbdedf26b149ab162 (diff) | |
| parent | c1677bcc395eb977cc7279a1af0a1d23ad23fdd4 (diff) | |
Merge remote-tracking branch 'remotes/palmer/tags/palmer-for-master-4.2-sf1' into staging
Update my MAINTAINERS file entry
This contains a single patch to change my email address.
# gpg: Signature made Fri 01 Nov 2019 16:14:45 GMT
# gpg: using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
# gpg: issuer "palmer@dabbelt.com"
# gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [unknown]
# gpg: aka "Palmer Dabbelt <palmer@sifive.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 00CE 76D1 8349 60DF CE88 6DF8 EF4C A150 2CCB AB41
* remotes/palmer/tags/palmer-for-master-4.2-sf1:
MAINTAINERS: Change to my personal email address
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 92961faa0e..c2a68555ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -259,7 +259,7 @@ F: include/hw/ppc/ F: disas/ppc.c RISC-V TCG CPUs -M: Palmer Dabbelt <palmer@sifive.com> +M: Palmer Dabbelt <palmer@dabbelt.com> M: Alistair Francis <Alistair.Francis@wdc.com> M: Sagar Karandikar <sagark@eecs.berkeley.edu> M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> @@ -2401,7 +2401,7 @@ F: tcg/ppc/ F: disas/ppc.c RISC-V TCG target -M: Palmer Dabbelt <palmer@sifive.com> +M: Palmer Dabbelt <palmer@dabbelt.com> M: Alistair Francis <Alistair.Francis@wdc.com> L: qemu-riscv@nongnu.org S: Maintained |