]> git.ipfire.org Git - thirdparty/iproute2.git/commit
Merge branch 'master' into net-next
authorDavid Ahern <dsahern@gmail.com>
Mon, 8 Jan 2018 18:10:45 +0000 (10:10 -0800)
committerDavid Ahern <dsahern@gmail.com>
Mon, 8 Jan 2018 18:10:45 +0000 (10:10 -0800)
commit6a21ca8a4aa44fa1826b3878f42e6b0a1b90bae0
tree40dfc37ca36c269f314fbde42e2c800823fc05b9
parent7d424c71935673665baed47ba7ee0ee20d29d4f3
parent9deb75428362de5d7cf5e971be37c6a205015e8d
Merge branch 'master' into net-next

 Conflicts:
man/man8/ip-link.8.in

Signed-off-by: David Ahern <dsahern@gmail.com>
ip/iplink.c
ip/link_gre.c
ip/link_gre6.c
man/man8/ip-link.8.in