David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
addr.c	tipc: make tipc node address support net namespace	2015-01-12 16:24:33 -05:00
addr.h	tipc: make tipc node address support net namespace	2015-01-12 16:24:33 -05:00
bcast.c	tipc: convert legacy nl link stat to nl compat	2015-02-09 13:20:47 -08:00
bcast.h	tipc: convert legacy nl link stat to nl compat	2015-02-09 13:20:47 -08:00
bearer.c	tipc: purge links when bearer is disabled	2015-02-27 18:18:47 -05:00
bearer.h	tipc: make media address offset a common define	2015-02-27 18:18:48 -05:00
core.c	tipc: nl compat add noop and remove legacy nl framework	2015-02-09 13:20:49 -08:00
core.h	tipc: remove tipc_snprintf	2015-02-09 13:20:49 -08:00
discover.c	tipc: reduce usage of context info in socket and link	2015-02-05 16:00:01 -08:00
discover.h	tipc: involve namespace infrastructure	2015-01-12 16:24:32 -05:00
eth_media.c	tipc: make media address offset a common define	2015-02-27 18:18:48 -05:00
ib_media.c	tipc: rename media/msg related definitions	2015-02-27 18:18:48 -05:00
Kconfig	tipc: convert tipc reference table to use generic rhashtable	2015-01-08 19:47:14 -08:00
link.c	tipc: nl compat add noop and remove legacy nl framework	2015-02-09 13:20:49 -08:00
link.h	tipc: convert legacy nl link stat reset to nl compat	2015-02-09 13:20:48 -08:00
Makefile	tipc: remove tipc_snprintf	2015-02-09 13:20:49 -08:00
msg.c	tipc: resolve race problem at unicast message reception	2015-02-05 16:00:02 -08:00
msg.h	tipc: rename media/msg related definitions	2015-02-27 18:18:48 -05:00
name_distr.c	tipc: only create header copy for name distr messages	2015-02-27 18:18:47 -05:00
name_distr.h	tipc: resolve race problem at unicast message reception	2015-02-05 16:00:02 -08:00
name_table.c	tipc: nl compat add noop and remove legacy nl framework	2015-02-09 13:20:49 -08:00
name_table.h	tipc: convert legacy nl name table dump to nl compat	2015-02-09 13:20:48 -08:00
net.c	tipc: nl compat add noop and remove legacy nl framework	2015-02-09 13:20:49 -08:00
net.h	tipc: make tipc node table aware of net namespace	2015-01-12 16:24:32 -05:00
netlink.c	tipc: move and rename the legacy nl api to "nl compat"	2015-02-09 13:20:47 -08:00
netlink.h	tipc: move and rename the legacy nl api to "nl compat"	2015-02-09 13:20:47 -08:00
netlink_compat.c	tipc: nl compat add noop and remove legacy nl framework	2015-02-09 13:20:49 -08:00
node.c	tipc: nl compat add noop and remove legacy nl framework	2015-02-09 13:20:49 -08:00
node.h	tipc: convert legacy nl node dump to nl compat	2015-02-09 13:20:49 -08:00
server.c	tipc: make subscriber server support net namespace	2015-01-12 16:24:33 -05:00
server.h	tipc: make subscriber server support net namespace	2015-01-12 16:24:33 -05:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
socket.h	tipc: convert legacy nl socket dump to nl compat	2015-02-09 13:20:48 -08:00
subscr.c	tipc: fix nullpointer bug when subscribing to events	2015-02-27 18:18:47 -05:00
subscr.h	tipc: make subscriber server support net namespace	2015-01-12 16:24:33 -05:00
sysctl.c	tipc: add name distributor resiliency queue	2014-09-01 17:51:48 -07:00