Commit 9d1eb21b authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge 



Antonio Quartulli says:

====================
This batch of patches includes a number of corrections and
improvements for our kernel-doc. These changes also make sure
that our doc is now properly processed by the kernel-doc
parsing tool.

Other than that you have a patch updating all the copyright
lines to 2016 and another patch switching the URLs in our
readme, Kconfig and MAINTAINERS file from "http" to "https".
Both by Sven Eckelmann.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e6359193 7b5e7396

Documentation/networking/batman-adv.txt

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ interfaces to the kernel module settings. 


For more information, please see the manpage (man batctl).



batctl is available on http://www.open-mesh.org/

batctl is available on https://www.open-mesh.org/





CONTACT

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2147,7 +2147,7 @@ M: Marek Lindner <mareklindner@neomailbox.ch> 
M:	Simon Wunderlich <sw@simonwunderlich.de>

M:	Antonio Quartulli <a@unstable.cc>

L:	b.a.t.m.a.n@lists.open-mesh.org

W:	http://www.open-mesh.org/

W:	https://www.open-mesh.org/

S:	Maintained

F:	net/batman-adv/

net/batman-adv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ config BATMAN_ADV 
          B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is

          a routing protocol for multi-hop ad-hoc mesh networks. The

          networks may be wired or wireless. See

          http://www.open-mesh.org/ for more information and user space

          https://www.open-mesh.org/ for more information and user space

          tools.



config BATMAN_ADV_BLA

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Copyright (C) 2007-2015 B.A.T.M.A.N. contributors:

# Copyright (C) 2007-2016  B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

net/batman-adv/bat_algo.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors:

/* Copyright (C) 2011-2016  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE