David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07:00
..
6lowpan	6lowpan: add support for 802.15.4 short addr handling	2016-06-15 20:41:24 -07:00
9p
802
8021q	net: introduce default neigh_construct/destroy ndo calls for L2 upper devices	2016-07-05 09:06:28 -07:00
appletalk
atm	net: add dev arg to ndo_neigh_construct/destroy	2016-07-05 09:06:28 -07:00
ax25	AX.25: Close socket connection on session completion	2016-06-18 20:55:34 -07:00
batman-adv	This feature patchset includes the following changes:	2016-07-04 23:33:59 -07:00
bluetooth
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
caif	caif: Remove unneeded header file	2016-06-28 05:26:14 -04:00
can	can: only call can_stat_update with procfs	2016-06-23 11:23:49 +02:00
ceph
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
dcb
dccp
decnet	net: fix decnet rtnexthop parsing	2016-07-05 14:08:47 -07:00
dns_resolver
dsa
ethernet
hsr
ieee802154	net: add dev arg to ndo_neigh_construct/destroy	2016-07-05 09:06:28 -07:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
ipx
irda
iucv	af_iucv: use paged SKBs for big inbound messages	2016-06-15 12:21:05 -07:00
kcm	bpf: refactor bpf_prog_get and type check into helper	2016-07-01 16:00:47 -04:00
key
l2tp
l3mdev	net: vrf: Implement get_saddr for IPv6	2016-06-17 21:25:29 -07:00
lapb
llc
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
mac802154
mpls	mpls: allow routes on ipgre devices	2016-06-16 17:12:07 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2016-07-06 09:15:15 -07:00
netlabel
netlink
netrom
nfc
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
phonet
qrtr
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
rfkill
rose
rxrpc	rxrpc: Kill off the rxrpc_transport struct	2016-06-22 14:00:23 +01:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
sunrpc
switchdev
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
unix
vmw_vsock	vsock: make listener child lock ordering explicit	2016-06-27 10:44:46 -04:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
x25
xfrm
compat.c
Kconfig
Makefile
socket.c
sysctl_net.c