[linux-next] LinuxNextTracking branch, master, updated. next-20131029

batman at open-mesh.org batman at open-mesh.org
Wed Oct 30 00:18:16 CET 2013


The following commit has been merged in the master branch:
commit c679ff8fb246cf1fa7f79fbf25a35048daebc84c
Author: Simon Wunderlich <sw at simonwunderlich.de>
Date:   Thu Oct 10 23:59:10 2013 +0200

    batman-adv: update email address for Simon Wunderlich
    
    My university will stop email service for alumni in january 2014, please
    use my new e-mail address instead.
    
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

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 <siwu at hrz.tu-chemnitz.de>
+Contact:        Simon Wunderlich <sw at simonwunderlich.de>
 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 <siwu at hrz.tu-chemnitz.de>
+Contact:        Simon Wunderlich <sw at simonwunderlich.de>
 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:   b.a.t.m.a.n at open-mesh.org (optional  subscription
 You can also contact the Authors:
 
 Marek  Lindner  <lindner_marek at yahoo.de>
-Simon  Wunderlich  <siwu at hrz.tu-chemnitz.de>
+Simon  Wunderlich  <sw at simonwunderlich.de>
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 <mareklindner at neomailbox.ch>
-M:	Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
+M:	Simon Wunderlich <sw at simonwunderlich.de>
 M:	Antonio Quartulli <antonio at meshcoding.com>
 L:	b.a.t.m.a.n at lists.open-mesh.org
 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 <lindner_marek at yahoo.de>, " \
-			     "Simon Wunderlich <siwu at hrz.tu-chemnitz.de>"
+			     "Simon Wunderlich <sw at simonwunderlich.de>"
 #define BATADV_DRIVER_DESC   "B.A.T.M.A.N. advanced"
 #define BATADV_DRIVER_DEVICE "batman-adv"
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list