Merge tag 'batadv-next-for-davem-20200630' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 30 Jun 2020 19:59:15 +0000 (12:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Jun 2020 19:59:15 +0000 (12:59 -0700)
commitd9b8b9845fab2f034ca981aa06b69d6a291f46a7
tree62d636ba9468172ba68341dd1dee90e837e1b7cf
parent65951a9eb65e79b5a056fa6912682d91136507a1
parent3bda14d09dc5789a895ab02b7dcfcec19b0a65b3
Merge tag 'batadv-next-for-davem-20200630' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
This feature/cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - update mailing list URL, by Sven Eckelmann

 - fix typos and grammar in documentation, by Sven Eckelmann

 - introduce a configurable per interface hop penalty,
   by Linus Luessing
====================

Signed-off-by: David S. Miller <davem@davemloft.net>