Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Aug 2017 03:23:23 +0000 (20:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Aug 2017 03:23:23 +0000 (20:23 -0700)
22 files changed:
1  2 
MAINTAINERS
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/netronome/nfp/flower/cmsg.c
drivers/net/ethernet/sfc/mcdi_port.c
drivers/net/wireless/intel/iwlwifi/mvm/fw.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
include/linux/net.h
include/net/udp.h
net/core/filter.c
net/ipv4/fib_semantics.c
net/ipv4/route.c
net/ipv4/tcp_ipv4.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/key/af_key.c
net/sched/sch_api.c
net/sched/sch_atm.c

diff --cc MAINTAINERS
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