David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_3ad.h drivers/net/bonding/bond_main.c Two minor conflicts in bonding, both of which were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-02-19 01:24:22 -05:00
..
addr.c	tipc: compress out gratuitous extra carriage returns	2012-04-30 15:53:56 -04:00
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: remove bearer_lock from tipc_bearer struct	2014-02-13 17:57:07 -05:00
bearer.h	tipc: remove bearer_lock from tipc_bearer struct	2014-02-13 17:57:07 -05:00
config.c	tipc: convert config_lock from spinlock to mutex	2013-06-17 15:53:01 -07:00
config.h	tipc: Optimize re-initialization of configuration service	2012-04-26 17:19:07 -04:00
core.c	tipc: remove 'links' list from tipc_bearer struct	2014-02-13 17:57:05 -05:00
core.h	tipc: fix message corruption bug for deferred packets	2014-02-13 16:35:05 -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: protect handler_enabled variable with qitem_lock spin lock	2013-12-10 22:35:49 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05: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	tipc: remove print_buf and deprecated log buffer code	2012-07-13 19:34:43 -04:00
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: remove unnecessary variables and conditions	2013-12-16 12:48:35 -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	genetlink: only pass array to genl_register_family_with_ops()	2013-11-19 16:39:05 -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	tipc: compress out gratuitous extra carriage returns	2012-04-30 15:53:56 -04:00
port.c	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
port.h	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
ref.c	tipc: use standard printk shortcut macros (pr_err etc.)	2012-07-13 19:24:44 -04:00
ref.h	tipc: cleanup function namespace	2010-10-16 11:13:24 -07:00
server.c	tipc: spelling fixes	2014-01-14 18:18:22 -08:00
server.h	tipc: introduce new TIPC server infrastructure	2013-06-17 15:53:00 -07:00
socket.c	tipc: align tipc function names with common naming practice in the network	2014-02-18 17:31:59 -05:00
subscr.c	tipc: spelling fixes	2014-01-14 18:18:22 -08: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