]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98a2af1 3cad6e5)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Thu, 1 Sep 2016 16:11:10 +0000 (09:11 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Thu, 1 Sep 2016 16:11:10 +0000 (09:11 -0700)
1  2 
include/linux/if_tunnel.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/if_tunnel.h
Simple merge
Upstream mirror of iproute2