Merge tag 'edac_for_3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 20:11:18 +0000 (13:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 20:11:18 +0000 (13:11 -0700)
commitf3acb96f38bb16057e98f862e70e56ca3588ef54
treed52bb9a2ba2c10dc2a89340252f1247d86a53df9
parentbaa6f8209312f9734434b89c12497774eea1cbe1
parentaad19e51769d761ffc0608b381313e18f0bd82b3
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()