Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2026-11-13 07:31:07 +00:00 · 2012-02-29 23:52:12 -05:00 · 2012-02-29 23:52:12 -05:00 · 06b8db9cac
commit 06b8db9cac
parent 9100eb012a 9bbbc59dbd
20 changed files with 288 additions and 349 deletions
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
--- 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/log.c
+++ b/net/tipc/log.c
--- 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/name_table.c
+++ b/net/tipc/name_table.c
--- a/net/tipc/name_table.h
+++ b/net/tipc/name_table.h
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c