--- a/CODE_OWNERS.TXT	Thu Dec 12 15:22:36 2013 +0900
+++ b/CODE_OWNERS.TXT	Mon Sep 08 22:06:00 2014 +0900
@@ -6,7 +6,7 @@
 The list is sorted by surname and formatted to allow easy grepping and
 beautification by scripts.  The fields are: name (N), email (E), web-address
 (W), PGP key ID and fingerprint (P), description (D), and snail-mail address
-(S).
+(S). Each entry should contain at least the (N), (E) and (D) fields.
 
 N: Joe Abbey
 E: jabbey@arxan.com
@@ -29,14 +29,20 @@
 E: evan.cheng@apple.com
 D: ARM target, parts of code generator not covered by someone else
 
+N: Renato Golin
+E: renato.golin@linaro.org
+D: ARM Linux support
+
 N: Eric Christopher
 E: echristo@gmail.com
 D: Debug Information, autotools/configure/make build, inline assembly
 
 N: Greg Clayton
+E: gclayton@apple.com
 D: LLDB
 
 N: Peter Collingbourne
+E: peter@pcc.me.uk
 D: libclc
 
 N: Anshuman Dasgupta
@@ -45,28 +51,30 @@
 
 N: Hal Finkel
 E: hfinkel@anl.gov
-D: BBVectorize, the loop reroller and the PowerPC target
+D: BBVectorize, the loop reroller, alias analysis and the PowerPC target
 
 N: Venkatraman Govindaraju
 E: venkatra@cs.wisc.edu
 D: Sparc Backend (lib/Target/Sparc/*)
 
 N: Tobias Grosser
+E: tobias@grosser.es
 D: Polly
 
 N: James Grosbach
 E: grosbach@apple.com
 D: MC layer
 
-N: Howard Hinnant
+N: Marshall Clow
+E: mclow.lists@gmail.com
 D: libc++
 
 N: Justin Holewinski
 E: jholewinski@nvidia.com
 D: NVPTX Target (lib/Target/NVPTX/*)
 
-N: Andy Kaylor
-E: andrew.kaylor@intel.com
+N: Lang Hames
+E: lhames@gmail.com
 D: MCJIT, RuntimeDyld and JIT event listeners
 
 N: Galina Kistanova
@@ -91,10 +99,11 @@
 D: Everything not covered by someone else
 
 N: Tim Northover
-E: Tim.Northover@arm.com
+E: t.p.northover@gmail.com
 D: AArch64 backend
 
 N: Jakob Olesen
+E: stoklund@2pi.dk
 D: Register allocators and TableGen
 
 N: Richard Osborne