Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-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 bf0e3df8e7a1039f8041214118c0e9377b9d85b2..ee3cc8b8c84ed991967637684b7996fe5c72d898 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -203,14 +203,6 @@ 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
 
@@ -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)