From 3f95ca6c0f89f31d0caf0aeb056e53c7bbcd7af3 Mon Sep 17 00:00:00 2001
From: Josh Conner <joshconner@google.com>
Date: Wed, 2 Nov 2016 02:10:45 +0000
Subject: [PATCH] MAINTAINERS (Write After Approval): Update email address,

2016-11-01  Josh Conner  <joshconner@google.com>

	* MAINTAINERS (Write After Approval): Update email address,

From-SVN: r241767
---
 ChangeLog   | 4 ++++
 MAINTAINERS | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a7061ab48fc..69997546d4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-01  Josh Conner  <joshconner@google.com>
+
+	* MAINTAINERS (Write After Approval): Update email address,
+
 2016-10-27  Carl Love  <cel@us.ibm.com>
 
 	* MAINTAINERS (Write After Approval): Fix my entry in the Write After
diff --git a/MAINTAINERS b/MAINTAINERS
index 10488870a8f..343c44b5f23 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -350,7 +350,7 @@ Tamar Christina					<tamar.christina@arm.com>
 Eric Christopher				<echristo@gmail.com>
 William Cohen					<wcohen@redhat.com>
 Michael Collison				<michael.collison@arm.com>
-Josh Conner					<jconner@apple.com>
+Josh Conner					<joshconner@google.com>
 R. Kelley Cook					<kcook@gcc.gnu.org>
 Christian Cornelssen				<ccorn@cs.tu-berlin.de>
 Ludovic Courtès					<ludo@gnu.org>