Fix up more e-mails and orgsHEADmaster

2 files changed, 18 insertions, 2 deletions

diff --git a/fix-emails b/fix-emails
index 5f9df3a..2360116 100755
--- a/fix-emails
+++ b/fix-emails
@@ -119,4 +119,7 @@ cat | sed \
  -e 's/<bas@basnieuwenhuien.nl>/<bas@basnieuwenhuizen.nl>/g' \
  -e 's/Dave Airlied/Dave Airlie/g' \
  -e 's/ailried@redhat.com/airlied@redhat.com/g' \
+ -e 's/eric.engestrom@imgtec.com/eric@engestrom.ch/g' \
+ -e 's/t_arceri@yahoo.com.au/tarceri@itsqueeze.com/g' \
+ -e 's/topi.pohjolainen@gmail.com/topi.pohjolainen@intel.com/g' \
  -e 's/^\s*//g'
diff --git a/to-organizations b/to-organizations
index 1a92fa2..a022bd9 100755
--- a/to-organizations
+++ b/to-organizations
@@ -21,6 +21,10 @@ cat \
 | sed 's/.*debian.org.*/Debian/g' \
 | sed 's/.*kde.org.*/KDE/g' \
 | sed 's/.*igalia.com.*/Igalia/g' \
+| sed 's/.*imgtec.com.*/Imagination/g' \
+| sed 's/.*collabora.com.*/Collabora/g' \
+| sed 's/.*pengutronix.de.*/Pengutronix/g' \
+| sed 's/.*feralinteractive.com.*/Feral Interactive/g' \
 | sed 's/Eric Anholt <eric@anholt.net>/Intel/g' \
 | sed 's/Kenneth Graunke <kenneth@whitecape.org>/Intel/g' \
 | sed 's/Matt Turner <mattst88@gmail.com>/Intel/g' \
@@ -34,7 +38,7 @@ cat \
 | sed 's/Daniel Vetter <daniel.vetter@ffwll.ch>/Intel/g' \
 | sed 's/Rodrigo Vivi <rodrigo.vivi@gmail.com>/Intel/g' \
 | sed 's/Todd Previte <tprevite@gmail.com>/Intel/g' \
-| sed 's/Dylan Baker <baker.dylan.c@gmail.com>/Intel/g' \
+| sed 's/Dylan Baker <dylan@pnwbakers.com>/Intel/g' \
 | sed 's/Josh Triplett <josh@joshtriplett.org>/Intel/g' \
 | sed 's/Mark Mueller <markkmueller@gmail.com>/Intel/g' \
 | sed 's/Nicholas Mack <nichmack@gmail.com>/Intel/g' \
@@ -42,10 +46,19 @@ cat \
 | sed 's/Steve Miller <dervishx@gmail.com>/Intel/g' \
 | sed 's/Ben Widawsky <ben@bwidawsk.net>/Intel/g' \
 | sed 's/Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>/Intel/g' \
+| sed 's/Chris Wilson <chris@chris-wilson.co.uk>/Intel/g' \
 | sed 's/Alexander von Gluck IV <kallisti5@unixzen.com>/Haiku/g' \
-| sed 's/Rob Clark <robclark@freedesktop.org>/Red Hat/g' \
+| sed 's/Rob Clark <robdclark@gmail.com>/Red Hat/g' \
 | sed 's/Dave Airlie <airlied@gmail.com>/Red Hat/g' \
 | sed 's/Chia-I Wu <olvaffe@gmail.com>/LunarG/g' \
+| sed 's/Jason Ekstrand <jason.ekstrand@intel.com>/Intel/g' \
+| sed 's/Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>/Google/g' \
+| sed 's/Samuel Pitoiset <samuel.pitoiset@gmail.com>/Valve/g' \
+| sed 's/Timothy Arceri <tarceri@itsqueeze.com>/Valve/g' \
+| sed 's/Eric Engestrom <eric@engestrom.ch>/Immagination/g' \
+| sed 's/Andres Rodriguez <andresx7@gmail.com>/Valve/g' \
+| sed 's/Daniel Stone <daniel@fooishbar.org>/Collabora/g' \
+| sed 's/Pierre Moreau <pierre.morrow@free.fr>/Red Hat/g' \
 | sed 's/.*@.*/Independent/g'
 
 #| sed 's/.*Emil Velikov.*/Emil Velikov/g' \