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 64831def40abe9b17043af9726762b7c2de3e251..63df2262d41a2625da0816a0383aaaece00963bc 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -307,6 +307,16 @@ 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
@@ -315,3 +325,5 @@ Why:        This driver has been marked obsolete for many years.
        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>
+
+---------------------------