diff options
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net-mesh | 4 | ||||
| -rw-r--r-- | Documentation/networking/batman-adv.txt | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | 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 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_iface>/mesh/bonding Date: June 2010 -Contact: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> +Contact: Simon Wunderlich <sw@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@hrz.tu-chemnitz.de> +Contact: Simon Wunderlich <sw@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 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 <lindner_marek@yahoo.de> -Simon Wunderlich <siwu@hrz.tu-chemnitz.de> +Simon Wunderlich <sw@simonwunderlich.de> 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 <mareklindner@neomailbox.ch> -M: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> +M: Simon Wunderlich <sw@simonwunderlich.de> M: Antonio Quartulli <antonio@meshcoding.com> 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 <lindner_marek@yahoo.de>, " \ - "Simon Wunderlich <siwu@hrz.tu-chemnitz.de>" + "Simon Wunderlich <sw@simonwunderlich.de>" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" |