]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b1c363 f539322)
Merge branch 'master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Tue, 24 Apr 2018 02:42:21 +0000 (19:42 -0700)
committerDavid Ahern <dsahern@gmail.com>
Tue, 24 Apr 2018 02:42:21 +0000 (19:42 -0700)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
tc/m_ife.c patch | diff1 | diff2 | blob | history

diff --cc tc/m_ife.c
Simple merge
Upstream mirror of iproute2