From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jul 2013 18:16:09 +0000 (-0700)
Subject: Merge tag 'please-pull-mce-therm' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.12-rc1~513
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9f4a7005fb1a0f6142cbb689e734621c61574d5;p=kernel%2Fkernel-generic.git

Merge tag 'please-pull-mce-therm' of git://git./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
---

a9f4a7005fb1a0f6142cbb689e734621c61574d5