David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
addr.c	tipc: compress out gratuitous extra carriage returns	2012-04-30 15:53:56 -04:00
addr.h	tipc: compress out gratuitous extra carriage returns	2012-04-30 15:53:56 -04:00
bcast.c	tipc: remove interface state mirroring in bearer	2013-12-09 20:30:29 -05:00
bcast.h	tipc: cosmetic realignment of function arguments	2013-06-17 15:53:01 -07:00
bearer.c	tipc: eliminate code duplication in media layer	2013-12-11 00:17:43 -05:00
bearer.h	tipc: eliminate code duplication in media layer	2013-12-11 00:17:43 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
core.h	tipc: Use <linux/uaccess.h> instead of <asm/uaccess.h>	2013-12-16 12:48:35 -05:00
discover.c	tipc: remove interface state mirroring in bearer	2013-12-09 20:30:29 -05:00
discover.h	tipc: rename struct link* to struct tipc_link*	2011-12-29 21:53:30 -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	tipc: remove unused 'blocked' flag from tipc_link struct	2013-12-11 00:17:43 -05:00
link.h	tipc: remove unused 'blocked' flag from tipc_link struct	2013-12-11 00:17:43 -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: eliminate an unnecessary cast of node variable	2012-11-22 14:33:28 -05:00
name_distr.h
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: change tipc_net_start routine return value type	2012-08-20 02:26:30 -07: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_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
node.c	tipc: eliminate redundant code with kfree_skb_list routine	2013-12-11 00:17:42 -05:00
node.h	tipc: message reassembly using fragment chain	2013-11-07 18:30:11 -05:00
port.c	tipc: remove unnecessary variables and conditions	2013-12-16 12:48:35 -05:00
port.h	tipc: remove iovec length parameter from all sending functions	2013-10-18 13:20:42 -04: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: fix oops when creating server socket fails	2013-08-01 15:54:33 -07:00
server.h	tipc: introduce new TIPC server infrastructure	2013-06-17 15:53:00 -07:00
socket.c	tipc: change lock_sock order in connect()	2013-12-16 12:48:35 -05:00
subscr.c	tipc: cosmetic realignment of function arguments	2013-06-17 15:53:01 -07: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