]> git.proxmox.com Git - mirror_iproute2.git/commit - include/uapi/linux/if_link.h
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)
commitd72ac5a17b6ad58dbebc43a21d843a3ad0215f16
tree972b541ef696c542bfd8df07bdfeb1d141a5bbff
parentcd458a77649ea11a98d8471559ab6b1c32b5f247
parent3e897912cbff9afd2cabb4999d6a895552633bdc
Merge branch 'master' into net-next
misc/ss.c
tc/tc_qdisc.c