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

[sfrench/cifs-2.6.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 676b7981adb771d5185c5bedd4c286ebc81d66f3..c6322c760348f243a30c61ffc22bd63259c3116a 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -278,14 +278,6 @@ Who:       Richard Purdie <rpurdie@rpsys.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>
-
----------------------------
-
 What:  Multipath cached routing support in ipv4
 When:  in 2.6.23
 Why:   Code was merged, then submitter immediately disappeared leaving