]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 31 Oct 2017 17:03:12 +0000 (18:03 +0100)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 31 Oct 2017 17:03:12 +0000 (18:03 +0100)
1  2 
include/uapi/linux/bpf.h
include/uapi/linux/sctp.h
man/man8/ip-link.8.in

Simple merge
Simple merge
Simple merge