]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge ../iproute2-next
authorStephen Hemminger <sthemmin@microsoft.com>
Mon, 7 Jan 2019 19:36:41 +0000 (11:36 -0800)
committerStephen Hemminger <sthemmin@microsoft.com>
Mon, 7 Jan 2019 19:36:41 +0000 (11:36 -0800)
1  2 
ip/ipneigh.c

diff --cc ip/ipneigh.c
Simple merge