From: Marek Lindner <[email protected]> Signed-off-by: Marek Lindner <[email protected]> Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Simon Wunderlich <[email protected]> --- .mailmap | 2 ++ Documentation/networking/batman-adv.rst | 2 +- MAINTAINERS | 2 +- net/batman-adv/main.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap index 5ff0e5d681e7..53e038f5f654 100644 --- a/.mailmap +++ b/.mailmap @@ -427,6 +427,8 @@ Marcin Nowakowski <[email protected]> <[email protected]> Marc Zyngier <[email protected]> <[email protected]> Marek Behún <[email protected]> <[email protected]> Marek Behún <[email protected]> Marek Behun <[email protected]> +Marek Lindner <[email protected]> <[email protected]> +Marek Lindner <[email protected]> <[email protected]> Mark Brown <[email protected]> Mark Starovoytov <[email protected]> <[email protected]> Markus Schneider-Pargmann <[email protected]> <[email protected]> diff --git a/Documentation/networking/batman-adv.rst b/Documentation/networking/batman-adv.rst index 8a0dcb1894b4..44b9b5cc0e24 100644 --- a/Documentation/networking/batman-adv.rst +++ b/Documentation/networking/batman-adv.rst @@ -164,5 +164,5 @@ Mailing-list: You can also contact the Authors: -* Marek Lindner <[email protected]> +* Marek Lindner <[email protected]> * Simon Wunderlich <[email protected]> diff --git a/MAINTAINERS b/MAINTAINERS index 1e930c7a58b1..c5e909a759e6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3867,7 +3867,7 @@ S: Maintained F: drivers/platform/x86/barco-p50-gpio.c BATMAN ADVANCED -M: Marek Lindner <[email protected]> +M: Marek Lindner <[email protected]> M: Simon Wunderlich <[email protected]> M: Antonio Quartulli <[email protected]> M: Sven Eckelmann <[email protected]> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 1fbe3a4dd965..964f3088af5b 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -7,7 +7,7 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ -#define BATADV_DRIVER_AUTHOR "Marek Lindner <[email protected]>, " \ +#define BATADV_DRIVER_AUTHOR "Marek Lindner <[email protected]>, " \ "Simon Wunderlich <[email protected]>" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" -- 2.39.5
