]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 22 Aug 2017 00:14:19 +0000 (17:14 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 22 Aug 2017 00:14:19 +0000 (17:14 -0700)
1  2 
include/utils.h
ip/iproute.c

diff --cc include/utils.h
Simple merge
diff --cc ip/iproute.c
Simple merge