From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Apr 2014 00:07:17 +0000 (-0700)
Subject: Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: firefly_0821_release~176^2~4155
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4a4389abdd9822fdf3cc2ac6ed87eb811fd43acc;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux_next' of git://git./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
---

4a4389abdd9822fdf3cc2ac6ed87eb811fd43acc