]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d40bdb 9b2ab68)
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Thu, 10 May 2018 04:04:16 +0000 (21:04 -0700)
committerDavid Ahern <dsahern@gmail.com>
Thu, 10 May 2018 04:04:16 +0000 (21:04 -0700)
 Conflicts:
rdma/include/uapi/rdma/rdma_netlink.h

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

Trivial merge
Upstream mirror of iproute2