]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Mon, 13 Nov 2017 18:35:17 +0000 (10:35 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 13 Nov 2017 18:35:17 +0000 (10:35 -0800)
1  2 
lib/utils.c

diff --cc lib/utils.c
Simple merge