1 files changed, 17 insertions, 59 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2d7ea85075ba..092c65dd35c2 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -49,16 +49,6 @@ Who:	Adrian Bunk <bunk@stusta.de>
 
 ---------------------------
 
-What:   raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN
-When:   June 2007
-Why:    Deprecated in favour of the more efficient and robust rawiso interface.
-        Affected are applications which use the deprecated part of libraw1394
-        (raw1394_iso_write, raw1394_start_iso_write, raw1394_start_iso_rcv,
-        raw1394_stop_iso_rcv) or bypass libraw1394.
-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
@@ -70,6 +60,7 @@ Who:	David Miller <davem@davemloft.net>
 
 What:   Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:   December 2006
+Files:  include/linux/video_decoder.h
 Why:    V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
         series. The old API have lots of drawbacks and don't provide enough
         means to work with all video and audio standards. The newer API is
@@ -103,6 +94,7 @@ Who:	Dominik Brodowski <linux@brodo.de>
 What:   remove EXPORT_SYMBOL(kernel_thread)
 When:   August 2006
 Files:  arch/*/kernel/*_ksyms.c
+Funcs:  kernel_thread
 Why:    kernel_thread is a low-level implementation detail.  Drivers should
         use the <linux/kthread.h> API instead which shields them from
         implementation details and provides a higherlevel interface that
@@ -204,28 +196,6 @@ Who:   Adrian Bunk <bunk@stusta.de>
 
 ---------------------------
 
-What:   ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver
-When:   December 2006
-Why:    Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are
-        functionally very much similar. They talk to ACPI in same way. Only
-        difference between them is the way they do frequency transitions.
-        One uses MSRs and the other one uses IO ports. Functionaliy of
-        speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq.
-        That means one common driver will support all Intel Enhanced Speedstep
-        capable CPUs. That means less confusion over name of
-        speedstep-centrino driver (with that driver supposed to be used on
-        non-centrino platforms). That means less duplication of code and
-        less maintenance effort and no possibility of these two drivers
-        going out of sync.
-        Current users of speedstep_centrino with ACPI hooks are requested to
-        switch over to acpi-cpufreq driver. speedstep-centrino will continue
-        to work using older non-ACPI static table based scheme even after this
-        date.
-
-Who:    Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
-
----------------------------
-
 What:   /sys/firmware/acpi/namespace
 When:   2.6.21
 Why:    The ACPI namespace is effectively the symbol list for
@@ -256,14 +226,6 @@ Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
 
-What:   sk98lin network driver
-When:   July 2007
-Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
-        replaced by the skge driver. 
-Who:    Stephen Hemminger <shemminger@osdl.org>
-
----------------------------
-
 What:   Compaq touchscreen device emulation
 When:   Oct 2007
 Files:  drivers/input/tsdev.c
@@ -278,25 +240,6 @@ Who:	Richard Purdie <rpurdie@rpsys.net>
 
 ---------------------------
 
-What:   Multipath cached routing support in ipv4
-When:   in 2.6.23
-Why:    Code was merged, then submitter immediately disappeared leaving
-        us with no maintainer and lots of bugs.  The code should not have
-        been merged in the first place, and many aspects of it's
-        implementation are blocking more critical core networking
-        development.  It's marked EXPERIMENTAL and no distribution
-        enables it because it cause obscure crashes due to unfixable bugs
-        (interfaces don't return errors so memory allocation can't be
-        handled, calling contexts of these interfaces make handling
-        errors impossible too because they get called after we've
-        totally commited to creating a route object, for example).
-        This problem has existed for years and no forward progress
-        has ever been made, and nobody steps up to try and salvage
-        this code, so we're going to finally just get rid of it.
-Who:    David S. Miller <davem@davemloft.net>
-
----------------------------
-
 What:   read_dev_chars(), read_conf_data{,_lpm}() (s390 common I/O layer)
 When:   December 2007
 Why:    These functions are a leftover from 2.4 times. They have several
@@ -346,3 +289,18 @@ Who:  Tejun Heo <htejun@gmail.com>
 
 ---------------------------
 
+What:   Legacy RTC drivers (under drivers/i2c/chips)
+When:   November 2007
+Why:    Obsolete. We have a RTC subsystem with better drivers.
+Who:    Jean Delvare <khali@linux-fr.org>
+
+---------------------------
+
+What:   iptables SAME target
+When:   1.1. 2008
+Files:  net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h
+Why:    Obsolete for multiple years now, NAT core provides the same behaviour.
+        Unfixable broken wrt. 32/64 bit cleanness.
+Who:    Patrick McHardy <kaber@trash.net>
+
+---------------------------