David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
addr.c
addr.h
bcast.c	net: tipc: fix stall during bclink wakeup procedure	2015-09-08 22:50:26 -07:00
bcast.h
bearer.c	tipc: send out RESET immediately when link goes down	2015-10-15 23:55:22 -07:00
bearer.h
core.c
core.h
discover.c
discover.h
eth_media.c
ib_media.c
Kconfig
link.c	tipc: update node FSM when peer RESET message is received	2015-10-15 23:55:23 -07:00
link.h	tipc: update node FSM when peer RESET message is received	2015-10-15 23:55:23 -07:00
Makefile
msg.c	tipc: disallow packet duplicates in link deferred queue	2015-10-15 23:55:21 -07:00
msg.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
name_distr.c
name_distr.h
name_table.c
name_table.h
net.c
net.h
netlink.c
netlink.h
netlink_compat.c
node.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
node.h
server.c
server.h
socket.c
socket.h
subscr.c
subscr.h
sysctl.c
udp_media.c	tipc: send out RESET immediately when link goes down	2015-10-15 23:55:22 -07:00