]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 5 Sep 2018 04:33:03 +0000 (21:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Sep 2018 04:33:03 +0000 (21:33 -0700)
16 files changed:
1  2 
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
include/net/cfg80211.h
net/core/filter.c
net/ipv6/route.c
net/mac80211/main.c
net/mac80211/rx.c
net/mac80211/tx.c
net/mac80211/util.c
net/sched/act_api.c
net/sched/act_ife.c
net/sched/act_pedit.c
net/tipc/topsrv.c
net/wireless/nl80211.c
net/wireless/reg.c
net/wireless/util.c
tools/bpf/bpftool/map.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge