Merge branch 'merge-fixes' into devel

1 files changed, 11 insertions, 38 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index bf0e3df8e7a1..af0e9393bf68 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -203,16 +203,8 @@ Who:  linuxppc-dev@ozlabs.org
 
 ---------------------------
 
-What:   sk98lin network driver
-When:   Feburary 2008
-Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
-        replaced by the skge driver. 
-Who:    Stephen Hemminger <shemminger@linux-foundation.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
@@ -221,8 +213,6 @@ Who:	Thomas Gleixner <tglx@linutronix.de>
 
 ---------------------------
 
----------------------------
-
 What:   i2c-i810, i2c-prosavage and i2c-savage4
 When:   May 2008
 Why:    These drivers are superseded by i810fb, intelfb and savagefb.
@@ -230,33 +220,6 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
-What:   bcm43xx wireless network driver
-When:   2.6.26
-Files:  drivers/net/wireless/bcm43xx
-Why:    This driver's functionality has been replaced by the
-        mac80211-based b43 and b43legacy drivers.
-Who:    John W. Linville <linville@tuxdriver.com>
-
----------------------------
-
-What:   ieee80211 softmac wireless networking component
-When:   2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211)
-Files:  net/ieee80211/softmac
-Why:    No in-kernel drivers will depend on it any longer.
-Who:    John W. Linville <linville@tuxdriver.com>
-
----------------------------
-
-What:   rc80211-simple rate control algorithm for mac80211
-When:   2.6.26
-Files:  net/mac80211/rc80211-simple.c
-Why:    This algorithm was provided for reference but always exhibited bad
-        responsiveness and performance and has some serious flaws. It has been
-        replaced by rc80211-pid.
-Who:    Stefano Brivio <stefano.brivio@polimi.it>
-
----------------------------
-
 What (Why):
         - include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files
           (superseded by xt_TOS/xt_tos target & match)
@@ -318,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