From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jul 2013 20:11:18 +0000 (-0700)
Subject: Merge tag 'edac_for_3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: firefly_0821_release~176^2~5793
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f3acb96f38bb16057e98f862e70e56ca3588ef54;p=firefly-linux-kernel-4.4.55.git

Merge tag 'edac_for_3.11' of git://git./linux/kernel/git/bp/bp

Pull AMD EDAC update from Borislav Petkov:
 "Add MCE signatures for family 0x15, models 30-3f"

* tag 'edac_for_3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, MCE, AMD: Add an MCE signature for new Fam15h models
  EDAC: Replace strict_strtoul() with kstrtoul()
---

f3acb96f38bb16057e98f862e70e56ca3588ef54