tree fd0da7010c1fe5878cd8b52eb6b01ba858e2f79f
parent 73f10274a6c8699738246ed2e1d704dc52702565
parent 49856dc973cd95d85ac1cab6c70410d8331e5c04
author Linus Torvalds <torvalds@linux-foundation.org> 1396570037 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1396570037 -0700

Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

Pull sb_edac patches from Mauro Carvalho Chehab:
 "A couple sb_edac driver improvements, cleaning a little bit the amount
  of data sent to dmesg, and fixing one error message"

* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  sb_edac: mark MCE messages as KERN_DEBUG
  sb_edac: use "event" instead of "exception" when MC wasnt signaled