From: Simon Wunderlich Date: Mon, 18 Sep 2017 12:41:20 +0000 (+0200) Subject: Merge pull request #324 from ecsv/batadv/compat-wireless-4.14-rc1 X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=bf4a73fb61a2ee40cab0f357aadcfce825198b1a Merge pull request #324 from ecsv/batadv/compat-wireless-4.14-rc1 batman-adv: Fix conflicts with compat-wireless backports-4.14-rc1 --- bf4a73fb61a2ee40cab0f357aadcfce825198b1a