Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1d171fe5fcdc7a1dc76509987fbfc0769a5f1d20..af0e9393bf684d62c70afcaa1c620709fceebb86 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -172,16 +172,6 @@ Who:       Len Brown <len.brown@intel.com>
 
 ---------------------------
 
-What:  ide-tape driver
-When:  July 2008
-Files: drivers/ide/ide-tape.c
-Why:   This driver might not have any users anymore and maintaining it for no
-       reason is an effort no one wants to make.
-Who:   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>, Borislav Petkov
-       <petkovbb@googlemail.com>
-
----------------------------
-
 What: libata spindown skipping and warning
 When: Dec 2008
 Why:  Some halt(8) implementations synchronize caches for and spin
@@ -214,7 +204,7 @@ Who:  linuxppc-dev@ozlabs.org
 ---------------------------
 
 What:  i386/x86_64 bzImage symlinks
-When:  April 2008
+When:  April 2010
 
 Why:   The i386/x86_64 merge provides a symlink to the old bzImage
        location so not yet updated user space tools, e.g. package
@@ -291,3 +281,13 @@ Why:       Not used in-tree. The current out-of-tree users used it to
        code / infrastructure should be in the kernel and not in some
        out-of-tree driver.
 Who:   Thomas Gleixner <tglx@linutronix.de>
+
+---------------------------
+
+What:  /sys/o2cb symlink
+When:  January 2010
+Why:   /sys/fs/o2cb is the proper location for this information - /sys/o2cb
+       exists as a symlink for backwards compatibility for old versions of
+       ocfs2-tools. 2 years should be sufficient time to phase in new versions
+       which know to look in /sys/fs/o2cb.
+Who:   ocfs2-devel@oss.oracle.com