]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d575c4 e4beb52)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Thu, 9 Nov 2017 00:45:17 +0000 (09:45 +0900)
committerStephen Hemminger <stephen@networkplumber.org>
Thu, 9 Nov 2017 00:45:17 +0000 (09:45 +0900)
1  2 
ip/xfrm_policy.c patch | diff1 | diff2 | blob | history
ip/xfrm_state.c patch | diff1 | diff2 | blob | history

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