Merge branch 'tipc-Mar13-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6

2026-10-16 22:39:48 +00:00 · 2011-03-13 18:49:11 -07:00 · 2011-03-13 18:49:11 -07:00 · 27b61ae2d7
commit 27b61ae2d7
parent 46af31800b 633d2bdedc
23 changed files with 278 additions and 394 deletions
--- a/6
+++ b/6
--- a/include/linux/tipc_config.h
+++ b/include/linux/tipc_config.h
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
--- a/net/tipc/node_subscr.c
+++ b/net/tipc/node_subscr.c
--- a/net/tipc/node_subscr.h
+++ b/net/tipc/node_subscr.h
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c