]> git.proxmox.com Git - mirror_iproute2.git/commit - include/uapi/linux/if_link.h
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Thu, 22 Feb 2018 22:43:33 +0000 (14:43 -0800)
committerDavid Ahern <dsahern@gmail.com>
Thu, 22 Feb 2018 22:43:33 +0000 (14:43 -0800)
commit472e59b0eb38586948d17454258ec88394177101
treedd64dc628f59d7caea5d55d316a445425cc8748b
parent2d165c08110585fdf00e6540322adba72732a727
parent6bfa7a6b0ec28b75274dc270e0f5a6eaf147e557
Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>
ip/ip.c