Merge pull request #269 from ecsv/batadv-fixes
authorSimon Wunderlich <sw@simonwunderlich.de>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
committerGitHub <noreply@github.com>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
commit3c466ebe40d61050ab51de50293548d8915e340e
treeecb5fd2cf2bf79c6d400087abf11ad6b862c6c56
parent713ea820140104e87fb5bc3a99c5d19e58f5fe4a
parent8a66ed185709df5b9120e602fda760969bebd632
Merge pull request #269 from ecsv/batadv-fixes

batman-adv: maint patch import + settings fixes
batctl/Makefile
batman-adv/Makefile