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

[linux-2.6-block.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a004b04ffd3a9afff7663e3413968e1eaa9a313d..2a4d77946c7dc075df1a6678a54204ea8e618502 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -407,15 +407,6 @@ Who:       Alex Chiang <achiang@hp.com>
 
 ---------------------------
 
-What:  i2c-voodoo3 driver
-When:  October 2009
-Why:   Superseded by tdfxfb. I2C/DDC support used to live in a separate
-       driver but this caused driver conflicts.
-Who:   Jean Delvare <khali@linux-fr.org>
-       Krzysztof Helt <krzysztof.h1@wp.pl>
-
----------------------------
-
 What:  CONFIG_RFKILL_INPUT
 When:  2.6.33
 Why:   Should be implemented in userspace, policy daemon.
@@ -492,3 +483,10 @@ Why:       With the recent innovations in CPU hardware acceleration technologies
 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>
+
+---------------------------