diff options
author | Simon Wunderlich <sw@simonwunderlich.de> | 2013-10-10 17:59:10 -0400 |
---|---|---|
committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-10-19 08:53:41 -0400 |
commit | c679ff8fb246cf1fa7f79fbf25a35048daebc84c (patch) | |
tree | 58203bd373aca36f6684c1bda0d0a4b814f54b50 | |
parent | 33faa04547d7ab51700bdc3fe9b6306d93dea43f (diff) |
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@simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-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: | |||
16 | 16 | ||
17 | What: /sys/class/net/<mesh_iface>/mesh/bonding | 17 | What: /sys/class/net/<mesh_iface>/mesh/bonding |
18 | Date: June 2010 | 18 | Date: June 2010 |
19 | Contact: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 19 | Contact: Simon Wunderlich <sw@simonwunderlich.de> |
20 | Description: | 20 | Description: |
21 | Indicates whether the data traffic going through the | 21 | Indicates whether the data traffic going through the |
22 | mesh will be sent using multiple interfaces at the | 22 | mesh will be sent using multiple interfaces at the |
@@ -24,7 +24,7 @@ Description: | |||
24 | 24 | ||
25 | What: /sys/class/net/<mesh_iface>/mesh/bridge_loop_avoidance | 25 | What: /sys/class/net/<mesh_iface>/mesh/bridge_loop_avoidance |
26 | Date: November 2011 | 26 | Date: November 2011 |
27 | Contact: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 27 | Contact: Simon Wunderlich <sw@simonwunderlich.de> |
28 | Description: | 28 | Description: |
29 | Indicates whether the bridge loop avoidance feature | 29 | Indicates whether the bridge loop avoidance feature |
30 | is enabled. This feature detects and avoids loops | 30 | 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 | |||
200 | You can also contact the Authors: | 200 | You can also contact the Authors: |
201 | 201 | ||
202 | Marek Lindner <lindner_marek@yahoo.de> | 202 | Marek Lindner <lindner_marek@yahoo.de> |
203 | Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 203 | 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 | |||
1653 | 1653 | ||
1654 | BATMAN ADVANCED | 1654 | BATMAN ADVANCED |
1655 | M: Marek Lindner <mareklindner@neomailbox.ch> | 1655 | M: Marek Lindner <mareklindner@neomailbox.ch> |
1656 | M: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 1656 | M: Simon Wunderlich <sw@simonwunderlich.de> |
1657 | M: Antonio Quartulli <antonio@meshcoding.com> | 1657 | M: Antonio Quartulli <antonio@meshcoding.com> |
1658 | L: b.a.t.m.a.n@lists.open-mesh.org | 1658 | L: b.a.t.m.a.n@lists.open-mesh.org |
1659 | W: http://www.open-mesh.org/ | 1659 | 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 @@ | |||
21 | #define _NET_BATMAN_ADV_MAIN_H_ | 21 | #define _NET_BATMAN_ADV_MAIN_H_ |
22 | 22 | ||
23 | #define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek@yahoo.de>, " \ | 23 | #define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek@yahoo.de>, " \ |
24 | "Simon Wunderlich <siwu@hrz.tu-chemnitz.de>" | 24 | "Simon Wunderlich <sw@simonwunderlich.de>" |
25 | #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" | 25 | #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" |
26 | #define BATADV_DRIVER_DEVICE "batman-adv" | 26 | #define BATADV_DRIVER_DEVICE "batman-adv" |
27 | 27 | ||