diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-10-30 11:11:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-30 11:11:00 +0000 |
| commit | 844178e7b327690068baeb45d413bc84d797db6b (patch) | |
| tree | 77fa9d96cd3e3f00d46b4852239c307ae1034510 /contrib | |
| parent | 63df86b26418baac9fe3a6ab09b3b7aa0807f11b (diff) | |
| parent | 82448ecd110ec1c4af1504a394b5ea5097dcca3c (diff) | |
| download | qemu-844178e7b327690068baeb45d413bc84d797db6b.zip qemu-844178e7b327690068baeb45d413bc84d797db6b.tar.gz qemu-844178e7b327690068baeb45d413bc84d797db6b.tar.bz2 | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-gitdm-next-271019-1' into staging
gitdm updates
- Add a few individuals
- Add China Mobile
# gpg: Signature made Sun 27 Oct 2019 19:21:15 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-gitdm-next-271019-1:
contrib/gitdm: add China Mobile to the domain map
contrib/gitdm: add Andrey to the individual group
contrib/gitdm: add Emanuele as an individual
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitdm/domain-map | 1 | ||||
| -rw-r--r-- | contrib/gitdm/group-map-individuals | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index 9efe066..dd79147 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -5,6 +5,7 @@ # amd.com AMD +cmss.chinamobile.com China Mobile citrix.com Citrix greensocs.com GreenSocs fujitsu.com Fujitsu diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals index 1c84717..cf8a2ce 100644 --- a/contrib/gitdm/group-map-individuals +++ b/contrib/gitdm/group-map-individuals @@ -14,3 +14,5 @@ noring@nocrew.org samuel.thibault@ens-lyon.org aurelien@aurel32.net balaton@eik.bme.hu +e.emanuelegiuseppe@gmail.com +andrew.smirnov@gmail.com |