Merge branch 'linus' into tracing/mmiotrace

1 files changed, 9 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 5b3f31faed56..46ece3fba6f9 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -312,3 +312,12 @@ When:	2.6.26
 Why:    Implementation became generic; users should now include
         linux/semaphore.h instead.
 Who:    Matthew Wilcox <willy@linux.intel.com>
+
+---------------------------
+
+What:   CONFIG_THERMAL_HWMON
+When:   January 2009
+Why:    This option was introduced just to allow older lm-sensors userspace
+        to keep working over the upgrade to 2.6.26. At the scheduled time of
+        removal fixed lm-sensors (2.x or 3.x) should be readily available.
+Who:    Rene Herman <rene.herman@gmail.com>