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-04-30 21:42:30 -04:00 · 2012-04-30 21:42:30 -04:00 · b6d151bb82
commit b6d151bb82
parent 1191cb8348 617d3c7a50
34 changed files with 58 additions and 567 deletions
--- a/net/tipc/Makefile
+++ b/net/tipc/Makefile
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.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/config.h
+++ b/net/tipc/config.h
--- 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/eth_media.c
+++ b/net/tipc/eth_media.c
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
--- a/net/tipc/log.c
+++ b/net/tipc/log.c
--- a/net/tipc/log.h
+++ b/net/tipc/log.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/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/node_subscr.c
+++ b/net/tipc/node_subscr.c
--- a/net/tipc/node_subscr.h
+++ b/net/tipc/node_subscr.h
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
--- a/net/tipc/ref.c
+++ b/net/tipc/ref.c
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h