]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <sthemmin@microsoft.com>
Wed, 25 Oct 2017 10:39:18 +0000 (12:39 +0200)
committerStephen Hemminger <sthemmin@microsoft.com>
Wed, 25 Oct 2017 10:39:18 +0000 (12:39 +0200)

Trivial merge