Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 9 Apr 2016 21:41:41 +0000 (17:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 Apr 2016 21:41:41 +0000 (17:41 -0400)
commitae95d7126104591348d37aaf78c8325967e02386
tree3270712f030549d77d4c55246d056e02b9def29d
parent03c5b534185f9844c1b5fcfdbae2adc32821ec42
parent183c948a3cb3efbf45eabed41fa7ee04c19378fc
Merge git://git./linux/kernel/git/davem/net
20 files changed:
MAINTAINERS
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/tun.c
include/linux/netdevice.h
include/net/mac80211.h
kernel/events/core.c
net/core/dev.c
net/core/sock.c
net/ipv4/fou.c
net/ipv6/ip6_output.c
net/l2tp/l2tp_ip6.c
net/mac80211/ieee80211_i.h
net/mac80211/mesh_hwmp.c
net/mac80211/sta_info.c
net/mac80211/sta_info.h
net/mac80211/tx.c
net/packet/af_packet.c
samples/bpf/Makefile