]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 11 Oct 2017 17:43:13 +0000 (10:43 -0700)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 11 Oct 2017 17:43:13 +0000 (10:43 -0700)
1  2 
include/uapi/linux/bpf.h
include/uapi/linux/if_link.h
include/uapi/linux/if_tun.h
include/uapi/linux/in6.h

Simple merge
Simple merge
Simple merge
Simple merge