]> git.proxmox.com Git - mirror_iproute2.git/commit
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)
commit92503441cc9fdd77b93cec98997f5558739644f2
tree79e548754e90f0211f208b7d24864d82b7882ca9
parent60509b997d1661ba14eae1baf0588f767000ab6b
parent596b1c94aa38e21b7a8c8562e8b61ccb744255d2
Merge branch 'master' into net-next
include/uapi/linux/bpf.h
include/uapi/linux/if_link.h
include/uapi/linux/if_tun.h
include/uapi/linux/in6.h