]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'merge-4.10' into next-merge
authorStephen Hemminger <sthemmin@microsoft.com>
Fri, 17 Feb 2017 23:34:24 +0000 (15:34 -0800)
committerStephen Hemminger <sthemmin@microsoft.com>
Fri, 17 Feb 2017 23:34:24 +0000 (15:34 -0800)

Trivial merge