From 863485d74acd2a99e661942b368f30a8fba85e4c Mon Sep 17 00:00:00 2001
From: Oskar Schirmer <oskar@scara.com>
Date: Wed, 16 May 2012 09:41:16 +0000
Subject: [PATCH] --- yaml --- r: 305135 b: refs/heads/master c:
 a45170e7ad65b2b7179c7bbe8780882159c829fb h: refs/heads/master i:   305133:
 f8b81b7cf3df8806e97e16666fb807aca13ba53e   305131:
 5119217a5cc710a343e2bee3aea5bbea19c3d2f4   305127:
 1db2b5bc02028b173a9831416af23059fdebdd91   305119:
 b7d1010160d413ec182de6aa5366a66097479ac7 v: v3

---
 [refs]                                                  | 2 +-
 trunk/arch/xtensa/variants/s6000/dmac.c                 | 2 +-
 trunk/arch/xtensa/variants/s6000/gpio.c                 | 4 ++--
 trunk/arch/xtensa/variants/s6000/include/variant/dmac.h | 2 +-
 trunk/arch/xtensa/variants/s6000/irq.c                  | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 878178ea796d..a28a017ee311 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6684b5729df289ba60a404d8d095d820dc553cdf
+refs/heads/master: a45170e7ad65b2b7179c7bbe8780882159c829fb
diff --git a/trunk/arch/xtensa/variants/s6000/dmac.c b/trunk/arch/xtensa/variants/s6000/dmac.c
index dc7f7c573518..340f5bb0b5ef 100644
--- a/trunk/arch/xtensa/variants/s6000/dmac.c
+++ b/trunk/arch/xtensa/variants/s6000/dmac.c
@@ -1,5 +1,5 @@
 /*
- * Authors:	Oskar Schirmer <os@emlix.com>
+ * Authors:	Oskar Schirmer <oskar@scara.com>
  *		Daniel Gloeckner <dg@emlix.com>
  * (c) 2008 emlix GmbH http://www.emlix.com
  *
diff --git a/trunk/arch/xtensa/variants/s6000/gpio.c b/trunk/arch/xtensa/variants/s6000/gpio.c
index 7af0757e001b..b89541ba39ab 100644
--- a/trunk/arch/xtensa/variants/s6000/gpio.c
+++ b/trunk/arch/xtensa/variants/s6000/gpio.c
@@ -2,8 +2,8 @@
  * s6000 gpio driver
  *
  * Copyright (c) 2009 emlix GmbH
- * Authors:	Oskar Schirmer <os@emlix.com>
- *		Johannes Weiner <jw@emlix.com>
+ * Authors:	Oskar Schirmer <oskar@scara.com>
+ *		Johannes Weiner <hannes@cmpxchg.org>
  *		Daniel Gloeckner <dg@emlix.com>
  */
 #include <linux/bitops.h>
diff --git a/trunk/arch/xtensa/variants/s6000/include/variant/dmac.h b/trunk/arch/xtensa/variants/s6000/include/variant/dmac.h
index e81735b2a206..3f88d9fc6897 100644
--- a/trunk/arch/xtensa/variants/s6000/include/variant/dmac.h
+++ b/trunk/arch/xtensa/variants/s6000/include/variant/dmac.h
@@ -8,7 +8,7 @@
  * Copyright (C) 2006 Tensilica Inc.
  * Copyright (C) 2008 Emlix GmbH <info@emlix.com>
  * Authors:	Fabian Godehardt <fg@emlix.com>
- *		Oskar Schirmer <os@emlix.com>
+ *		Oskar Schirmer <oskar@scara.com>
  *		Daniel Gloeckner <dg@emlix.com>
  */
 
diff --git a/trunk/arch/xtensa/variants/s6000/irq.c b/trunk/arch/xtensa/variants/s6000/irq.c
index 6651e3285fcf..81a241e79075 100644
--- a/trunk/arch/xtensa/variants/s6000/irq.c
+++ b/trunk/arch/xtensa/variants/s6000/irq.c
@@ -2,8 +2,8 @@
  * s6000 irq crossbar
  *
  * Copyright (c) 2009 emlix GmbH
- * Authors:	Johannes Weiner <jw@emlix.com>
- *		Oskar Schirmer <os@emlix.com>
+ * Authors:	Johannes Weiner <hannes@cmpxchg.org>
+ *		Oskar Schirmer <oskar@scara.com>
  */
 #include <linux/io.h>
 #include <asm/irq.h>