From: Simon Wunderlich Date: Thu, 10 Oct 2013 21:59:10 +0000 (+0200) Subject: batman-adv: update email address for Simon Wunderlich X-Git-Tag: firefly_0821_release~176^2~4992^2~156^2~16 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c679ff8fb246cf1fa7f79fbf25a35048daebc84c;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Marek Lindner --- diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh index f00a69b68a25..96ae0a45135f 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/bonding Date: June 2010 -Contact: Simon Wunderlich +Contact: Simon Wunderlich 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/bridge_loop_avoidance Date: November 2011 -Contact: Simon Wunderlich +Contact: Simon Wunderlich 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 897d1f4e1df1..89ace66bfe9a 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@open-mesh.org (optional subscription You can also contact the Authors: Marek Lindner -Simon Wunderlich +Simon Wunderlich diff --git a/MAINTAINERS b/MAINTAINERS index a46bcf816a6a..f169259ccdc6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1653,7 +1653,7 @@ F: include/linux/backlight.h BATMAN ADVANCED M: Marek Lindner -M: Simon Wunderlich +M: Simon Wunderlich M: Antonio Quartulli L: b.a.t.m.a.n@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 54c13d51edbe..c754f8e5bc3c 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 , " \ - "Simon Wunderlich " + "Simon Wunderlich " #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv"