1 files changed, 22 insertions, 11 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index e82c15de7d27..040f437c421b 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -207,17 +207,6 @@ Who:	Thomas Gleixner <tglx@linutronix.de>
 
 ---------------------------
 
-What:   i2c-ite and i2c-algo-ite drivers
-When:   September 2006
-Why:    These drivers never compiled since they were added to the kernel
-        tree 5 years ago. This feature removal can be reevaluated if
-        someone shows interest in the drivers, fixes them and takes over
-        maintenance.
-        http://marc.theaimsgroup.com/?l=linux-mips&m=115040510817448
-Who:    Jean Delvare <khali@linux-fr.org>
-
----------------------------
-
 What:   Bridge netfilter deferred IPv4/IPv6 output hook calling
 When:   January 2007
 Why:    The deferred output hooks are a layering violation causing unusual
@@ -261,3 +250,25 @@ Why:	The new layer 3 independant connection tracking replaces the old
 Who:    Patrick McHardy <kaber@trash.net>
 
 ---------------------------
+
+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>
+
+---------------------------