David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
addr.c
addr.h	tipc: explicitly include core.h in addr.h	2014-02-13 17:49:13 -05:00
bcast.c	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
bcast.h	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
bearer.c	tipc: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
bearer.h	tipc: remove bearer_lock from tipc_bearer struct	2014-02-13 17:57:07 -05:00
config.c	tipc: allow connection shutdown callback to be invoked in advance	2014-03-06 14:46:23 -05:00
config.h
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
core.h	tipc: make bearer set up in module insertion stage	2014-02-22 00:00:15 -05:00
discover.c	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
discover.h	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
eth_media.c	tipc: eliminate code duplication in media layer	2013-12-11 00:17:43 -05:00
handler.c	tipc: don't log disabled tasklet handler errors	2014-03-06 14:46:24 -05:00
ib_media.c	tipc: eliminate code duplication in media layer	2013-12-11 00:17:43 -05:00
Kconfig	tipc: add InfiniBand media type	2013-04-17 14:18:33 -04:00
link.c	tipc: eliminate upcall function pointers between port and socket	2014-03-12 15:53:49 -04:00
link.h	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
log.c
Makefile	tipc: introduce new TIPC server infrastructure	2013-06-17 15:53:00 -07:00
msg.c	tipc: remove iovec length parameter from all sending functions	2013-10-18 13:20:42 -04:00
msg.h	tipc: message reassembly using fragment chain	2013-11-07 18:30:11 -05:00
name_distr.c	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
name_distr.h	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
name_table.c	tipc: fix memory leak during module removal	2014-03-06 14:46:24 -05:00
name_table.h	tipc: cosmetic realignment of function arguments	2013-06-17 15:53:01 -07:00
net.c	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
net.h	tipc: change tipc_net_start routine return value type	2012-08-20 02:26:30 -07:00
netlink.c	tipc: remove all enabled flags from all tipc components	2014-02-22 00:00:15 -05:00
node.c	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
node.h	tipc: remove 'has_redundant_link' flag from STATE link protocol messages	2014-01-07 18:44:25 -05:00
node_subscr.c	tipc: cosmetic realignment of function arguments	2013-06-17 15:53:01 -07:00
node_subscr.h
port.c	tipc: eliminate redundant lookups in registry	2014-03-12 15:53:49 -04:00
port.h	tipc: eliminate redundant lookups in registry	2014-03-12 15:53:49 -04:00
ref.c	tipc: eliminate redundant lookups in registry	2014-03-12 15:53:49 -04:00
ref.h	tipc: eliminate redundant lookups in registry	2014-03-12 15:53:49 -04:00
server.c	tipc: fix connection refcount leak	2014-03-06 14:46:23 -05:00
server.h	tipc: remove all enabled flags from all tipc components	2014-02-22 00:00:15 -05:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
socket.h	tipc: align usage of variable names and macros in socket	2014-03-12 15:53:49 -04:00
subscr.c	tipc: drop subscriber connection id invalidation	2014-03-06 14:46:23 -05:00
subscr.h	tipc: cosmetic realignment of function arguments	2013-06-17 15:53:01 -07:00
sysctl.c	tipc: change socket buffer overflow control to respect sk_rcvbuf	2013-06-17 15:53:00 -07:00