diff --git a/[refs] b/[refs] index 6a2cef656872..2015b410f299 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fb790ee3a063a85fb17fa3f85370837c3d73afb +refs/heads/master: f887cc48c6464af20058e81544e73e33daacbd52 diff --git a/trunk/net/tipc/Kconfig b/trunk/net/tipc/Kconfig index bc41bd31eadc..4f99600a5fed 100644 --- a/trunk/net/tipc/Kconfig +++ b/trunk/net/tipc/Kconfig @@ -3,8 +3,8 @@ # menuconfig TIPC - tristate "The TIPC Protocol (EXPERIMENTAL)" - depends on INET && EXPERIMENTAL + tristate "The TIPC Protocol" + depends on INET ---help--- The Transparent Inter Process Communication (TIPC) protocol is specially designed for intra cluster communication. This protocol