1 files changed, 68 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 9bc37529f4cd..b3d1ce7e3ba0 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -226,6 +226,23 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
+What:   i2c_adapter.dev
+        i2c_adapter.list
+When:   July 2007
+Why:    Superfluous, given i2c_adapter.class_dev:
+          * The "dev" was a stand-in for the physical device node that legacy
+            drivers would not have; but now it's almost always present.  Any
+            remaining legacy drivers must upgrade (they now trigger warnings).
+          * The "list" duplicates class device children.
+        The delay in removing this is so upgraded lm_sensors and libsensors
+        can get deployed.  (Removal causes minor changes in the sysfs layout,
+        notably the location of the adapter type name and parenting the i2c
+        client hardware directly from their controller.)
+Who:    Jean Delvare <khali@linux-fr.org>,
+        David Brownell <dbrownell@users.sourceforge.net>
+
+---------------------------
+
 What:   IPv4 only connection tracking/NAT/helpers
 When:   2.6.22
 Why:    The new layer 3 independant connection tracking replaces the old
@@ -257,6 +274,43 @@ Who:	Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 
 ---------------------------
 
+<<<<<<< test:Documentation/feature-removal-schedule.txt
+What:   ACPI hotkey driver (CONFIG_ACPI_HOTKEY)
+When:   2.6.21
+Why:    hotkey.c was an attempt to consolidate multiple drivers that use
+        ACPI to implement hotkeys.  However, hotkeys are not documented
+        in the ACPI specification, so the drivers used undocumented
+        vendor-specific hooks and turned out to be more different than
+        the same.
+
+        Further, the keys and the features supplied by each platform
+        are different, so there will always be a need for
+        platform-specific drivers.
+
+        So the new plan is to delete hotkey.c and instead, work on the
+        platform specific drivers to try to make them look the same
+        to the user when they supply the same features.
+
+        hotkey.c has always depended on CONFIG_EXPERIMENTAL
+
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
+
+What:   /sys/firmware/acpi/namespace
+When:   2.6.21
+Why:    The ACPI namespace is effectively the symbol list for
+        the BIOS.  The device names are completely arbitrary
+        and have no place being exposed to user-space.
+
+        For those interested in the BIOS ACPI namespace,
+        the BIOS can be extracted and disassembled with acpidump
+        and iasl as documented in the pmtools package here:
+        http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
+
 What:   ACPI procfs interface
 When:   July 2007
 Why:    After ACPI sysfs conversion, ACPI attributes will be duplicated
@@ -265,3 +319,17 @@ Who:	Zhang Rui <rui.zhang@intel.com>
 
 ---------------------------
 
+What:   /proc/acpi/button
+When:   August 2007
+Why:    /proc/acpi/button has been replaced by events to the input layer
+        since 2.6.20.
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
+
+What:   JFFS (version 1)
+When:   2.6.21
+Why:    Unmaintained for years, superceded by JFFS2 for years.
+Who:    Jeff Garzik <jeff@garzik.org>
+
+---------------------------