From 85f24f6c85435326b896987a9a9237bd86c1b22e Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Thu, 13 Dec 2012 13:08:47 -0500
Subject: [PATCH] --- yaml --- r: 350159 b: refs/heads/master c:
 503637375269e33f368fd3484a199beace01f36e h: refs/heads/master i:   350157:
 0957da18d5d5497e458bf8c23d70bfddd9eb2ce7   350155:
 0b025c0e56c98cade42d8e8ace1703138d629373   350151:
 409652f48cc0f7efe7912dcb3e93fa3f139f3bed   350143:
 3546d2ead1e44e7bbae3615245ba11e98d7baf46 v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d015048dd26a..95bef478ebca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e817fb62cd185a2232ad4302579491805609489
+refs/heads/master: 503637375269e33f368fd3484a199beace01f36e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 59203e77ce9e..b90891293916 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -6282,7 +6282,7 @@ F:	drivers/dma/dw_dmac_regs.h
 F:	drivers/dma/dw_dmac.c
 
 TIMEKEEPING, NTP
-M:	John Stultz <johnstul@us.ibm.com>
+M:	John Stultz <john.stultz@linaro.org>
 M:	Thomas Gleixner <tglx@linutronix.de>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:	Supported