]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18d7817 73aa988)
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 patch | diff1 | diff2 | blob | history
ip/iproute.c patch | diff1 | diff2 | blob | history

diff --cc include/utils.h
Simple merge
diff --cc ip/iproute.c
Simple merge
Mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git