Merge tag 'batadv-next-for-davem-20190830' of git://git.open-mesh.org/linux-merge

davem330 · davem330 · commit 5c63592f90c6 · 2019-08-31T13:15:19.000-07:00
Simon Wunderlich says:

====================
This maintenance patchset includes the following patches:

 - Add Sven to the MAINTAINERS file, by Simon Wunderlich
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -2923,6 +2923,7 @@ BATMAN ADVANCED
 M:	Marek Lindner <mareklindner@neomailbox.ch>
 M:	Simon Wunderlich <sw@simonwunderlich.de>
 M:	Antonio Quartulli <a@unstable.cc>
+M:	Sven Eckelmann <sven@narfation.org>
 L:	b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)
 W:	https://www.open-mesh.org/
 B:	https://www.open-mesh.org/projects/batman-adv/issues

-Original file line number
+Diff line change
 M:	Marek Lindner <[email protected]>
 M:	Simon Wunderlich <[email protected]>
 M:	Antonio Quartulli <[email protected]>
 +M:	Sven Eckelmann <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	https://www.open-mesh.org/
 B:	https://www.open-mesh.org/projects/batman-adv/issues