Subject: [PATCH 02/18] batman-adv: update email address for Simon Wunderlich

From: Antonio Quartulli <[email-masked]>
Date: Sun, 20 Oct 2013 00:21:54 +0200

From: Simon Wunderlich <[email-masked]>

My university will stop email service for alumni in january 2014, please
use my new e-mail address instead.

Signed-off-by: Simon Wunderlich <[email-masked]>
Signed-off-by: Marek Lindner <[email-masked]>
---
 Documentation/ABI/testing/sysfs-class-net-mesh | 4 ++--
 Documentation/networking/batman-adv.txt        | 2 +-
 MAINTAINERS                                    | 2 +-
 net/batman-adv/main.h                          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh
index f00a69b..96ae0a4 100644
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
@@ -16,7 +16,7 @@ Description:
 
 What:           /sys/class/net/<mesh_iface>/mesh/bonding
 Date:           June 2010
-Contact:        Simon Wunderlich <[email-masked]>
+Contact:        Simon Wunderlich <[email-masked]>
 Description:
                 Indicates whether the data traffic going through the
                 mesh will be sent using multiple interfaces at the
@@ -24,7 +24,7 @@ Description:
 
 What:           /sys/class/net/<mesh_iface>/mesh/bridge_loop_avoidance
 Date:           November 2011
-Contact:        Simon Wunderlich <[email-masked]>
+Contact:        Simon Wunderlich <[email-masked]>
 Description:
                 Indicates whether the bridge loop avoidance feature
                 is enabled. This feature detects and avoids loops
diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 897d1f4..89ace66 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -200,4 +200,4 @@ Mailing-list:   [email-masked] (optional  subscription
 You can also contact the Authors:
 
 Marek  Lindner  <[email-masked]>
-Simon  Wunderlich  <[email-masked]>
+Simon  Wunderlich  <[email-masked]>
diff --git a/MAINTAINERS b/MAINTAINERS
index a46bcf81..f169259 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1653,7 +1653,7 @@ F:	include/linux/backlight.h
 
 BATMAN ADVANCED
 M:	Marek Lindner <[email-masked]>
-M:	Simon Wunderlich <[email-masked]>
+M:	Simon Wunderlich <[email-masked]>
 M:	Antonio Quartulli <[email-masked]>
 L:	[email-masked]
 W:	http://www.open-mesh.org/
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 54c13d5..c754f8e 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -21,7 +21,7 @@
 #define _NET_BATMAN_ADV_MAIN_H_
 
 #define BATADV_DRIVER_AUTHOR "Marek Lindner <[email-masked]>, " \
-			     "Simon Wunderlich <[email-masked]>"
+			     "Simon Wunderlich <[email-masked]>"
 #define BATADV_DRIVER_DESC   "B.A.T.M.A.N. advanced"
 #define BATADV_DRIVER_DEVICE "batman-adv"
 
-- 
1.8.4