diff --git a/[refs] b/[refs] index 653fdedcb31b..91f789c0ccf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c3607676c12d77d70cc712310f52fbc6af5895d +refs/heads/master: 60fe7403209179fccd6629172c4b36acc69c5db6 diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig index 7342a9afe018..3e63123f7bbd 100644 --- a/trunk/net/ipv4/Kconfig +++ b/trunk/net/ipv4/Kconfig @@ -448,7 +448,6 @@ config IP_TCPDIAG_IPV6 config TCP_CONG_ADVANCED bool "TCP: advanced congestion control" depends on INET - default y ---help--- Support for selection of various TCP congestion control modules.