Merge pull request #318 from ecsv/batadv-2017.2-ftbfs
authorSimon Wunderlich <sw@simonwunderlich.de>
Sat, 12 Aug 2017 07:15:34 +0000 (09:15 +0200)
committerGitHub <noreply@github.com>
Sat, 12 Aug 2017 07:15:34 +0000 (09:15 +0200)
batman-adv: Prevent FTBFS when redefining ether_setup


Trivial merge