Merge Linux 2.6.23

1 files changed, 16 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a43d2878a4ef..00928d2ecfb2 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -197,6 +197,14 @@ Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
 
+What:   /proc/acpi/event
+When:   February 2008
+Why:    /proc/acpi/event has been replaced by events via the input layer
+        and netlink since 2.6.23.
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
+
 What:   Compaq touchscreen device emulation
 When:   Oct 2007
 Files:  drivers/input/tsdev.c
@@ -290,3 +298,11 @@ 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>
+
+---------------------------