Loading .mailmap +2 −0 Original line number Diff line number Diff line Loading @@ -427,6 +427,8 @@ Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com> Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com> Marek Behún <kabel@kernel.org> <marek.behun@nic.cz> Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz> Marek Lindner <marek.lindner@mailbox.org> <lindner_marek@yahoo.de> Marek Lindner <marek.lindner@mailbox.org> <mareklindner@neomailbox.ch> Mark Brown <broonie@sirena.org.uk> Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com> Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de> Loading Documentation/networking/batman-adv.rst +1 −1 Original line number Diff line number Diff line Loading @@ -164,5 +164,5 @@ Mailing-list: You can also contact the Authors: * Marek Lindner <mareklindner@neomailbox.ch> * Marek Lindner <marek.lindner@mailbox.org> * Simon Wunderlich <sw@simonwunderlich.de> MAINTAINERS +1 −1 Original line number Diff line number Diff line Loading @@ -3867,7 +3867,7 @@ S: Maintained F: drivers/platform/x86/barco-p50-gpio.c BATMAN ADVANCED M: Marek Lindner <mareklindner@neomailbox.ch> M: Marek Lindner <marek.lindner@mailbox.org> M: Simon Wunderlich <sw@simonwunderlich.de> M: Antonio Quartulli <a@unstable.cc> M: Sven Eckelmann <sven@narfation.org> Loading net/batman-adv/main.h +1 −1 Original line number Diff line number Diff line Loading @@ -7,7 +7,7 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ #define BATADV_DRIVER_AUTHOR "Marek Lindner <mareklindner@neomailbox.ch>, " \ #define BATADV_DRIVER_AUTHOR "Marek Lindner <marek.lindner@mailbox.org>, " \ "Simon Wunderlich <sw@simonwunderlich.de>" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" Loading Loading
.mailmap +2 −0 Original line number Diff line number Diff line Loading @@ -427,6 +427,8 @@ Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com> Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com> Marek Behún <kabel@kernel.org> <marek.behun@nic.cz> Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz> Marek Lindner <marek.lindner@mailbox.org> <lindner_marek@yahoo.de> Marek Lindner <marek.lindner@mailbox.org> <mareklindner@neomailbox.ch> Mark Brown <broonie@sirena.org.uk> Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com> Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de> Loading
Documentation/networking/batman-adv.rst +1 −1 Original line number Diff line number Diff line Loading @@ -164,5 +164,5 @@ Mailing-list: You can also contact the Authors: * Marek Lindner <mareklindner@neomailbox.ch> * Marek Lindner <marek.lindner@mailbox.org> * Simon Wunderlich <sw@simonwunderlich.de>
MAINTAINERS +1 −1 Original line number Diff line number Diff line Loading @@ -3867,7 +3867,7 @@ S: Maintained F: drivers/platform/x86/barco-p50-gpio.c BATMAN ADVANCED M: Marek Lindner <mareklindner@neomailbox.ch> M: Marek Lindner <marek.lindner@mailbox.org> M: Simon Wunderlich <sw@simonwunderlich.de> M: Antonio Quartulli <a@unstable.cc> M: Sven Eckelmann <sven@narfation.org> Loading
net/batman-adv/main.h +1 −1 Original line number Diff line number Diff line Loading @@ -7,7 +7,7 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ #define BATADV_DRIVER_AUTHOR "Marek Lindner <mareklindner@neomailbox.ch>, " \ #define BATADV_DRIVER_AUTHOR "Marek Lindner <marek.lindner@mailbox.org>, " \ "Simon Wunderlich <sw@simonwunderlich.de>" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" Loading