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

Trivial merge