Merge branch 'misc' into release

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b959659c5df46414413530bd213f1e50aa528ee3..e4615253ba89069ffa8bc525f77803bb9d2ef5b7 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -259,14 +259,6 @@ 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:  /proc/acpi/event
 When:  February 2008
 Why:   /proc/acpi/event has been replaced by events via the input layer
@@ -603,3 +595,19 @@ Why:       The adm9240, w83792d and w83793 hardware monitoring drivers have
 Who:   Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
+
+What:  noswapaccount kernel command line parameter
+When:  2.6.40
+Why:   The original implementation of memsw feature enabled by
+       CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
+       kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
+       turned out to be not ideal because we cannot have the feature compiled
+       in and disabled by default and let only interested to enable it
+       (e.g. general distribution kernels might need it). Therefore we have
+       added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides
+       the both possibilities. If we remove noswapaccount we will have
+       less command line parameters with the same functionality and we
+       can also cleanup the parameter handling a bit ().
+Who:   Michal Hocko <mhocko@suse.cz>
+
+----------------------------