]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d165c0 6bfa7a6)
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Thu, 22 Feb 2018 22:43:33 +0000 (14:43 -0800)
committerDavid Ahern <dsahern@gmail.com>
Thu, 22 Feb 2018 22:43:33 +0000 (14:43 -0800)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
ip/ip.c patch | diff1 | diff2 | blob | history

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