summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-29 12:22:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-29 12:22:30 -0700
commit0acbbee440fadf45164cc9537ee7d528d045f2d6 (patch)
treecbdb4d3f7fa97fd657f2e8e3489591dc444b9f23 /Documentation
parent535e49f48e2fc95a6de8efb366ca8af35d424642 (diff)
parentc4e6a2e64e948de42473e9c829181d768b1258c3 (diff)
downloadop-kernel-dev-0acbbee440fadf45164cc9537ee7d528d045f2d6.zip
op-kernel-dev-0acbbee440fadf45164cc9537ee7d528d045f2d6.tar.gz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled. ACPI: don't walk tables if ACPI was disabled thermal: Create CONFIG_THERMAL_HWMON=n
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 5b3f31f..46ece3f 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>
OpenPOWER on IntegriCloud