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

Trivial merge