Merge pull request #384 from ecsv/batadv-2018.1
authorSimon Wunderlich <sw@simonwunderlich.de>
Wed, 13 Jun 2018 09:53:11 +0000 (11:53 +0200)
committerGitHub <noreply@github.com>
Wed, 13 Jun 2018 09:53:11 +0000 (11:53 +0200)
batman-adv: add patches from 2018.1-maint 2018-06-12


Trivial merge