]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into next-merge
authorStephen Hemminger <sthemmin@microsoft.com>
Fri, 17 Feb 2017 23:29:24 +0000 (15:29 -0800)
committerStephen Hemminger <sthemmin@microsoft.com>
Fri, 17 Feb 2017 23:29:24 +0000 (15:29 -0800)

Trivial merge