Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[pandora-kernel.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2291ff6..c6322c7 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -59,6 +59,15 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
 
 ---------------------------
 
+What:  old NCR53C9x driver
+When:  October 2007
+Why:   Replaced by the much better esp_scsi driver.  Actual low-level
+       driver can ported over almost trivially.
+Who:   David Miller <davem@davemloft.net>
+       Christoph Hellwig <hch@lst.de>
+
+---------------------------
+
 What:  Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:  December 2006
 Why:   V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
@@ -269,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