Merge pull request #324 from ecsv/batadv/compat-wireless-4.14-rc1
authorSimon Wunderlich <sw@simonwunderlich.de>
Mon, 18 Sep 2017 12:41:20 +0000 (14:41 +0200)
committerGitHub <noreply@github.com>
Mon, 18 Sep 2017 12:41:20 +0000 (14:41 +0200)
commitbf4a73fb61a2ee40cab0f357aadcfce825198b1a
tree3445ed0175928cbb4d97f82f93103b0200af81ee
parent3cc8d49900fafbe76f44e0e912ee888fafd8bbb4
parent7d5648775aa4dd554d5dc4e7c26ebd843b3e4474
Merge pull request #324 from ecsv/batadv/compat-wireless-4.14-rc1

batman-adv: Fix conflicts with compat-wireless backports-4.14-rc1