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