Merge remote-tracking branch 'remotes/stsquad/tags/pull-gitdm-next-120319-1' into staging
Final gitdm updates for 4.0
# gpg: Signature made Tue 12 Mar 2019 19:33:51 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-120319-1:
contrib: gitdm: add a mapping for Janus Technologies
contrib: gitdm: another IBM email
contrib: gitdm: add more individual contributors
contrib: gitdm: Update Wave Computing group
contrib: gitdm: Update domain-map
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index 0ab41ee..fa9d454 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -5,10 +5,15 @@
#
amd.com AMD
+citrix.com Citrix
greensocs.com GreenSocs
+fujitsu.com Fujitsu
+huawei.com Huawei
ibm.com IBM
igalia.com Igalia
+intel.com Intel
linaro.org Linaro
+microsoft.com Microsoft
nokia.com Nokia
oracle.com Oracle
proxmox.com Proxmox
diff --git a/contrib/gitdm/group-map-ibm b/contrib/gitdm/group-map-ibm
index 2272731..da62fa3 100644
--- a/contrib/gitdm/group-map-ibm
+++ b/contrib/gitdm/group-map-ibm
@@ -11,3 +11,4 @@
jcfaracco@gmail.com
joel@jms.id.au
sjitindarsingh@gmail.com
+tommusta@gmail.com
diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index afdbe7d..05e355d 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -8,3 +8,8 @@
f4bug@amsat.org
mjt@tls.msk.ru
mark.cave-ayland@ilande.co.uk
+rth@twiddle.net
+noring@nocrew.org
+samuel.thibault@ens-lyon.org
+aurelien@aurel32.net
+balaton@eik.bme.hu
diff --git a/contrib/gitdm/group-map-janustech b/contrib/gitdm/group-map-janustech
new file mode 100644
index 0000000..4ae7cc2
--- /dev/null
+++ b/contrib/gitdm/group-map-janustech
@@ -0,0 +1,5 @@
+#
+# Janus Technologies contributors using non-corporate email
+#
+
+marcel.apfelbaum@gmail.com
diff --git a/contrib/gitdm/group-map-wavecomp b/contrib/gitdm/group-map-wavecomp
index 2801a96..c5c57f0 100644
--- a/contrib/gitdm/group-map-wavecomp
+++ b/contrib/gitdm/group-map-wavecomp
@@ -5,13 +5,25 @@
aleksandar.markovic@imgtec.com
aleksandar.markovic@mips.com
+alex.smith@imgtec.com
+andrew.bennett@imgtec.com
amarkovic@wavecomp.com
arikalo@wavecomp.com
+chris@mips.com
dnikolic@wavecomp.com
+ericj@mips.com
+goran.ferenc@imgtec.com
+james.cowgill@mips.com
+james.hogan@imgtec.com
james.hogan@mips.com
leon.alrae@imgtec.com
+matt.redfearn@imgtec.com
matthew.fortune@mips.com
+miodrag.dinic@imgtec.com
+paul@archlinuxmips.org
paul.burton@imgtec.com
+petar.jovanovic@imgtec.com
+petarj@mips.com
pburton@wavecomp.com
smarkovic@wavecomp.com
yongbok.kim@imgtec.com
diff --git a/gitdm.config b/gitdm.config
index 7472d4b..c01c219 100644
--- a/gitdm.config
+++ b/gitdm.config
@@ -36,6 +36,7 @@
GroupMap contrib/gitdm/group-map-cadence Cadence Design Systems
GroupMap contrib/gitdm/group-map-codeweavers CodeWeavers
GroupMap contrib/gitdm/group-map-ibm IBM
+GroupMap contrib/gitdm/group-map-janustech Janus Technologies
# Also group together our prolific individual contributors
# and those working under academic auspices
