]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d57639a 1dd0cca)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Fri, 2 Dec 2016 22:19:08 +0000 (14:19 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 2 Dec 2016 22:19:08 +0000 (14:19 -0800)
1  2 
misc/ss.c patch | diff1 | diff2 | blob | history

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