]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 19 Apr 2016 15:01:55 +0000 (08:01 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 19 Apr 2016 15:01:55 +0000 (08:01 -0700)

Trivial merge