Merge tag 'please-pull-mce-therm' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/therm_throt.c
Simple merge