Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-beck.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 72ae06f73acfdc19ebae808e27c789676908cb7a..591e94448e636edebab3791bdd69363b54a13895 100644 (file)
--- 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
 
@@ -392,15 +407,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.