diff --git a/[refs] b/[refs] index 283b09bf6e7c..2d283e432d3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50f9bcddf8be147678c2d4ef8ac5279222d0ae3a +refs/heads/master: c11ac3f236d73dd00c21ab4f06166606dea71ef3 diff --git a/trunk/net/tipc/Kconfig b/trunk/net/tipc/Kconfig index 05ab18e62dee..3891cc00087d 100644 --- a/trunk/net/tipc/Kconfig +++ b/trunk/net/tipc/Kconfig @@ -8,7 +8,12 @@ menu "TIPC Configuration (EXPERIMENTAL)" config TIPC tristate "The TIPC Protocol (EXPERIMENTAL)" ---help--- - TBD. + The Transparent Inter Process Communication (TIPC) protocol is + specially designed for intra cluster communication. This protocol + originates from Ericsson where it has been used in carrier grade + cluster applications for many years. + + For more information about TIPC, see http://tipc.sourceforge.net. This protocol support is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you