diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-06 16:13:09 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-06 16:13:10 +0000 |
commit | 299d1ea9bb56bd9f45f905125489bdd7d543a1aa (patch) | |
tree | 6bb02d130c0c6f0eebc13df4f0aa4a07ec70c161 | |
parent | d24aaf2a2915424962fb101142f28fa4307f4740 (diff) | |
parent | 94d973bdaacb69b034f675fc0fd3f285fea17f94 (diff) |
Merge remote-tracking branch 'remotes/yongbok/tags/mips-20171106' into staging
MIPS patches 2017-11-06
Changes:
Update email addresses of Yongbok Kim, James Hogan and Paul Burton.
# gpg: Signature made Mon 06 Nov 2017 15:38:58 GMT
# gpg: using RSA key 0x2238EB86D5F797C2
# gpg: Good signature from "Yongbok Kim <yongbok.kim@mips.com>"
# gpg: aka "Yongbok Kim <yongbok.kim@imgtec.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 8600 4CF5 3415 A5D9 4CFA 2B5C 2238 EB86 D5F7 97C2
* remotes/yongbok/tags/mips-20171106:
MAINTAINERS: Update Paul Burton's email address
MAINTAINERS: Update James Hogan's email address
MAINTAINERS: Update Yongbok Kim's email address
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | .mailmap | 3 | ||||
-rw-r--r-- | MAINTAINERS | 10 |
2 files changed, 8 insertions, 5 deletions
@@ -8,8 +8,11 @@ Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-7 Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> +James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> +Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com> +Paul Burton <paul.burton@mips.com> <paul@archlinuxmips.org> Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> # There is also a: diff --git a/MAINTAINERS b/MAINTAINERS index 1fd7a6273c..0cd4d028aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -162,7 +162,7 @@ F: disas/microblaze.c MIPS M: Aurelien Jarno <aurelien@aurel32.net> -M: Yongbok Kim <yongbok.kim@imgtec.com> +M: Yongbok Kim <yongbok.kim@mips.com> S: Maintained F: target/mips/ F: hw/mips/ @@ -285,7 +285,7 @@ S: Maintained F: target/arm/kvm.c MIPS -M: James Hogan <james.hogan@imgtec.com> +M: James Hogan <jhogan@kernel.org> S: Maintained F: target/mips/kvm.c @@ -626,7 +626,7 @@ S: Maintained F: hw/mips/mips_malta.c Mipssim -M: Yongbok Kim <yongbok.kim@imgtec.com> +M: Yongbok Kim <yongbok.kim@mips.com> S: Odd Fixes F: hw/mips/mips_mipssim.c F: hw/net/mipsnet.c @@ -637,12 +637,12 @@ S: Maintained F: hw/mips/mips_r4k.c Fulong 2E -M: Yongbok Kim <yongbok.kim@imgtec.com> +M: Yongbok Kim <yongbok.kim@mips.com> S: Odd Fixes F: hw/mips/mips_fulong2e.c Boston -M: Paul Burton <paul.burton@imgtec.com> +M: Paul Burton <paul.burton@mips.com> S: Maintained F: hw/core/loader-fit.c F: hw/mips/boston.c |