path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-04 13:04:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-04 13:04:39 -0700
commitb8a3c6091a2337391ed878693604d712d6420241 (patch)
treeaa6bad4575406465b88b0dfc03e1a166c363bde3 /Documentation
parented8319e9b269ed19449432db3aefc11eb7be7376 (diff)
parent85f1bb4ace038289d587bcff64128be10613f9f3 (diff)
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: ACPI: Eliminate us to pm ticks conversion in common path ACPI: Fix the incorrect calculation about C-state idle time ACPI: update feature-removal.txt to reflect deleted acpi=ht option ACPI / EC / PM: Fix names of functions that block/unblock EC transactions ACPI / EC / PM: Fix race between EC transactions and system suspend
Diffstat (limited to 'Documentation')
1 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 672be0109d0..c268783bc4e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -578,15 +578,6 @@ Who: Avi Kivity <avi@redhat.com>
-What: "acpi=ht" boot option
-When: 2.6.35
-Why: Useful in 2003, implementation is a hack.
- Generally invoked by accident today.
- Seen as doing more harm than good.
-Who: Len Brown <len.brown@intel.com>
What: iwlwifi 50XX module parameters
When: 2.6.40
Why: The "..50" modules parameters were used to configure 5000 series and