]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
projects / mirror_iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad4b142 1e600da)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Mon, 1 May 2017 16:26:51 +0000 (09:26 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 1 May 2017 16:26:51 +0000 (09:26 -0700)

Trivial merge
Upstream mirror of iproute2