Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 8ae8dad8e1504801f0db34c33512a5e68ab1ca60..9474501dd6cc4db9b9b0833d5ef5455ff1e4b1e2 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -71,15 +71,6 @@ Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
 
 ---------------------------
 
-What:  i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid
-When:  November 2005
-Files: drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c
-Why:   Match the other drivers' name for the same function, duplicate names
-       will be available until removal of old names.
-Who:   Grant Coady <gcoady@gmail.com>
-
----------------------------
-
 What:  remove EXPORT_SYMBOL(panic_timeout)
 When:  April 2006
 Files: kernel/panic.c