Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 00928d2ecfb229506b574271efdcb59dd105f02a..63df2262d41a2625da0816a0383aaaece00963bc 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -306,3 +306,24 @@ Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
 Who:    Stephen Hemminger <shemminger@linux-foundation.org>
 
 ---------------------------
+
+What:  i386/x86_64 bzImage symlinks
+When:  April 2008
+
+Why:   The i386/x86_64 merge provides a symlink to the old bzImage
+       location so not yet updated user space tools, e.g. package
+       scripts, do not break.
+Who:   Thomas Gleixner <tglx@linutronix.de>
+
+---------------------------
+
+What:  shaper network driver
+When:  January 2008
+Files: drivers/net/shaper.c, include/linux/if_shaper.h
+Why:   This driver has been marked obsolete for many years.
+       It was only designed to work on lower speed links and has design
+       flaws that lead to machine crashes. The qdisc infrastructure in
+       2.4 or later kernels, provides richer features and is more robust.
+Who:   Stephen Hemminger <shemminger@linux-foundation.org>
+
+---------------------------