diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 11:16:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 11:16:09 -0700 |
| commit | a9f4a7005fb1a0f6142cbb689e734621c61574d5 (patch) | |
| tree | 151f02b324a0976ffd71f700ce97f8e39443a094 /Documentation | |
| parent | 37577505ec6e67d550aa5fb452c7b45a093cc7f3 (diff) | |
| parent | 6bb2ff846f24fa6efee756e5e2a2b8433d65671e (diff) | |
Merge tag 'please-pull-mce-therm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull thermal power-limit update from Tony Luck:
"Thermal limit warnings are too scary and cause unnecessary concern"
* tag 'please-pull-mce-therm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
x86 thermal: Disable power limit notification interrupt by default
x86 thermal: Delete power-limit-notification console messages
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 81732b8abd3a..7310b08bee5e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1158,6 +1158,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver Format: <irq> + int_pln_enable [x86] Enable power limit notification interrupt + intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option on Enable intel iommu driver. |