]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Mon, 6 Feb 2017 22:13:27 +0000 (14:13 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 6 Feb 2017 22:13:27 +0000 (14:13 -0800)

Trivial merge