summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 10:04:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 10:04:01 -0700
commit6742259866d03d5bc19815441ba928e8378343dc (patch)
tree3450a2e7c22777ca5ca4cb4944c4b2ed1f218805 /Documentation
parent20d9d9a0544436b1b8c94689c01d746d6bd5525c (diff)
parentdba69d1092e291e257fb5673a3ad0e4c87878ebc (diff)
downloadlinux-3.10-6742259866d03d5bc19815441ba928e8378343dc.tar.gz
linux-3.10-6742259866d03d5bc19815441ba928e8378343dc.tar.bz2
linux-3.10-6742259866d03d5bc19815441ba928e8378343dc.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar. * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, kvm: Call restore_sched_clock_state() only after %gs is initialized x86: Use -mno-avx when available x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility x86: Preserve lazy irq disable semantics in fixup_irqs()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c1be8066ea5..709e08e9a22 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,14 +6,6 @@ be removed from this file.
---------------------------
-What: x86 floppy disable_hlt
-When: 2012
-Why: ancient workaround of dubious utility clutters the
- code used by everybody else.
-Who: Len Brown <len.brown@intel.com>
-
----------------------------
-
What: CONFIG_APM_CPU_IDLE, and its ability to call APM BIOS in idle
When: 2012
Why: This optional sub-feature of APM is of dubious reliability,