]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Sat, 9 Dec 2017 05:32:33 +0000 (21:32 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Sat, 9 Dec 2017 05:32:33 +0000 (21:32 -0800)

Trivial merge