Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6a451f47d40f3ede1ee6b726b5782d13ed145d6b..0bc8b0b2e103421cc7062e01d642b91cd0dc3abd 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -304,3 +304,23 @@ Why:       The code says it was obsolete when it was written in 2001.
 Who:   Richard Purdie <rpurdie@rpsys.net>
 
 ---------------------------
+
+What:  Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK)
+When:  with the merge of wireless-dev, 2.6.22 or later
+Why:   The option/code is
+        * not enabled on most kernels
+        * not required by any userspace tools (except an experimental one,
+          and even there only for some parts, others use ioctl)
+        * pointless since wext is no longer evolving and the ioctl
+          interface needs to be kept
+Who:   Johannes Berg <johannes@sipsolutions.net>
+
+---------------------------
+
+What:  i8xx_tco watchdog driver
+When:  in 2.6.22
+Why:   the i8xx_tco watchdog driver has been replaced by the iTCO_wdt
+       watchdog driver.
+Who:   Wim Van Sebroeck <wim@iguana.be>
+
+---------------------------