projects / feed / routing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cc8d49 7d56487)
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)
batman-adv: Fix conflicts with compat-wireless backports-4.14-rc1


Trivial merge
Mirror of routing feed