]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Fri, 4 Aug 2017 16:54:44 +0000 (09:54 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 4 Aug 2017 16:54:44 +0000 (09:54 -0700)

Trivial merge