]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
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
ip/xfrm_state.c

Simple merge
diff --cc ip/xfrm_state.c
Simple merge