]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 12 Dec 2017 20:12:20 +0000 (12:12 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 12 Dec 2017 20:12:20 +0000 (12:12 -0800)

Trivial merge