The following commit has been merged in the merge/master branch: commit cb02b8d163d2875999c0dc96cf1a3830131fe000 Author: Antonio Quartulli antonio@meshcoding.com Date: Fri Oct 11 08:21:20 2013 +0200

batman-adv: update email addresses in BATADV_DRIVER_AUTHOR

Update Marek Lindner's and Simon Wunderlich's email address

Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index cfbc49b..773301a 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -20,8 +20,8 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_

-#define BATADV_DRIVER_AUTHOR "Marek Lindner lindner_marek@yahoo.de, " \ - "Simon Wunderlich siwu@hrz.tu-chemnitz.de" +#define BATADV_DRIVER_AUTHOR "Marek Lindner mareklindner@neomailbox.ch, " \ + "Simon Wunderlich sw@simonwunderlich.de" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv"