1 files changed, 41 insertions, 37 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index bc693fffabe0..870d190fe617 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,6 +6,21 @@ be removed from this file.
 
 ---------------------------
 
+What:   USER_SCHED
+When:   2.6.34
+
+Why:    USER_SCHED was implemented as a proof of concept for group scheduling.
+        The effect of USER_SCHED can already be achieved from userspace with
+        the help of libcgroup. The removal of USER_SCHED will also simplify
+        the scheduler code with the removal of one major ifdef. There are also
+        issues USER_SCHED has with USER_NS. A decision was taken not to fix
+        those and instead remove USER_SCHED. Also new group scheduling
+        features will not be implemented for USER_SCHED.
+
+Who:    Dhaval Giani <dhaval@linux.vnet.ibm.com>
+
+---------------------------
+
 What:   PRISM54
 When:   2.6.34
 
@@ -276,22 +291,6 @@ Who:	Michael Buesch <mb@bu3sch.de>
 
 ---------------------------
 
-What:   usedac i386 kernel parameter
-When:   2.6.27
-Why:    replaced by allowdac and no dac combination
-Who:    Glauber Costa <gcosta@redhat.com>
-
----------------------------
-
-What: print_fn_descriptor_symbol()
-When: October 2009
-Why:  The %pF vsprintf format provides the same functionality in a
-      simpler way.  print_fn_descriptor_symbol() is deprecated but
-      still present to give out-of-tree modules time to change.
-Who:  Bjorn Helgaas <bjorn.helgaas@hp.com>
-
----------------------------
-
 What:   /sys/o2cb symlink
 When:   January 2010
 Why:    /sys/fs/o2cb is the proper location for this information - /sys/o2cb
@@ -302,18 +301,6 @@ Who:	ocfs2-devel@oss.oracle.com
 
 ---------------------------
 
-What:   SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,
-        SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD
-When:   June 2009
-Why:    A newer version of the options have been introduced in 2005 that
-        removes the limitions of the old API.  The sctp library has been
-        converted to use these new options at the same time.  Any user
-        space app that directly uses the old options should convert to using
-        the new options.
-Who:    Vlad Yasevich <vladislav.yasevich@hp.com>
-
----------------------------
-
 What:   Ability for non root users to shm_get hugetlb pages based on mlock
         resource limits
 When:   2.6.31
@@ -404,15 +391,6 @@ Who:	Alex Chiang <achiang@hp.com>
 
 ---------------------------
 
-What:   i2c-voodoo3 driver
-When:   October 2009
-Why:    Superseded by tdfxfb. I2C/DDC support used to live in a separate
-        driver but this caused driver conflicts.
-Who:    Jean Delvare <khali@linux-fr.org>
-        Krzysztof Helt <krzysztof.h1@wp.pl>
-
----------------------------
-
 What:   CONFIG_RFKILL_INPUT
 When:   2.6.33
 Why:    Should be implemented in userspace, policy daemon.
@@ -489,3 +467,29 @@ Why:	With the recent innovations in CPU hardware acceleration technologies
 Who:    Alok N Kataria <akataria@vmware.com>
 
 ----------------------------
+
+What:   adt7473 hardware monitoring driver
+When:   February 2010
+Why:    Obsoleted by the adt7475 driver.
+Who:    Jean Delvare <khali@linux-fr.org>
+
+---------------------------
+What:   Support for lcd_switch and display_get in asus-laptop driver
+When:   March 2010
+Why:    These two features use non-standard interfaces. There are the
+        only features that really need multiple path to guess what's
+        the right method name on a specific laptop.
+
+        Removing them will allow to remove a lot of code an significantly
+        clean the drivers.
+
+        This will affect the backlight code which won't be able to know
+        if the backlight is on or off. The platform display file will also be
+        write only (like the one in eeepc-laptop).
+
+        This should'nt affect a lot of user because they usually know
+        when their display is on or off.
+
+Who:    Corentin Chary <corentin.chary@gmail.com>
+
+----------------------------