]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 14 Mar 2017 23:42:59 +0000 (16:42 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 14 Mar 2017 23:42:59 +0000 (16:42 -0700)

Trivial merge