diff --git a/[refs] b/[refs] index de07bcf10183..db82a9efc7b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e26b203ede31fffd52571a5ba607a26c79dc5c0d +refs/heads/master: f0d1b3c2bcc5de8a17af5f2274f7fcde8292b5fc diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 50d82ae09e2a..6d3dcd4eb649 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -588,3 +588,9 @@ Why: Remount currently allows changing bound subsystems and replaced with conventional fsnotify. ---------------------------- + +What: net/wanrouter/ +When: June 2013 +Why: Unsupported/unmaintained/unused since 2.6 + +---------------------------- diff --git a/trunk/net/wanrouter/Kconfig b/trunk/net/wanrouter/Kconfig index 61ceae0b9566..a157a2e64e18 100644 --- a/trunk/net/wanrouter/Kconfig +++ b/trunk/net/wanrouter/Kconfig @@ -3,7 +3,7 @@ # config WAN_ROUTER - tristate "WAN router" + tristate "WAN router (DEPRECATED)" depends on EXPERIMENTAL ---help--- Wide Area Networks (WANs), such as X.25, frame relay and leased