Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 31575e2..ed511af 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -449,12 +449,6 @@ Who:       Alok N Kataria <akataria@vmware.com>
 
 ----------------------------
 
-What:  adt7473 hardware monitoring driver
-When:  February 2010
-Why:   Obsoleted by the adt7475 driver.
-Who:   Jean Delvare <khali@linux-fr.org>
-
----------------------------
 What:  Support for lcd_switch and display_get in asus-laptop driver
 When:  March 2010
 Why:   These two features use non-standard interfaces. There are the
@@ -588,3 +582,10 @@ Why:       The paravirt mmu host support is slower than non-paravirt mmu, both
 Who:   Avi Kivity <avi@redhat.com>
 
 ----------------------------
+
+What:  "acpi=ht" boot option
+When:  2.6.35
+Why:   Useful in 2003, implementation is a hack.
+       Generally invoked by accident today.
+       Seen as doing more harm than good.
+Who:   Len Brown <len.brown@intel.com>