From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Feb 2013 19:28:50 +0000 (-0800)
Subject: Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=55529fa5762462beb39f913c5277cb96c7be0858;p=~shefty%2Frdma-dev.git

Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC updates from Borislav Petkov:
 "Mostly AMD's side of EDAC.  It is basically a new family enablement
  stuff: AMD F16h MCE decoding enablement from Jacob Shin.  The rest is
  trivial cleanups."

* tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  mpc85xx_edac: Fix typo
  EDAC, MCE, AMD: Remove unneeded exports
  EDAC, MCE, AMD: Add MCE decoding support for Family 16h
  EDAC, MCE, AMD: Make MC2 decoding per-family
  amd64_edac: Remove dead code
---

55529fa5762462beb39f913c5277cb96c7be0858