Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b9a3fdc1cc5a570269ff399790d22f0dedc7828f..675f75601ae632a694fe06a0e8658b5039bf586f 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -298,3 +298,19 @@ Why:       All mthca hardware also supports MSI-X, which provides
 Who:   Roland Dreier <rolandd@cisco.com>
 
 ---------------------------
+
+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
+
+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>