tree 0bfce428f067ca9cf06d971ba8795ad69ca610e2
parent 1bc87b00556e8f7ba30a1010471951c5b8f71114
parent 1f6189ed18cbd99d90bffdbc76c3adc54418b2fd
author Linus Torvalds <torvalds@linux-foundation.org> 1320014612 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320014612 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Cleanup return type of amd64_determine_edac_cap()
  amd64_edac: Add a fix for Erratum 505
  EDAC, MCE, AMD: Simplify NB MCE decoder interface
  EDAC, MCE, AMD: Drop local coreid reporting
  EDAC, MCE, AMD: Print valid addr when reporting an error
  EDAC, MCE, AMD: Print CPU number when reporting the error