Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Apr 2017 15:36:24 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Apr 2017 15:36:24 +0000 (08:36 -0700)
Pull RAS fix from Thomas Gleixner:
 "Prevent dmesg from being spammed when MCE logging is active"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Don't print MCEs when mcelog is active


Trivial merge