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: (26 commits)
  amd64_edac: add MAINTAINERS entry
  EDAC: do not enable modules by default
  amd64_edac: do not enable module by default
  amd64_edac: add module registration routines
  amd64_edac: add ECC reporting initializers
  amd64_edac: add EDAC core-related initializers
  amd64_edac: add error decoding logic
  amd64_edac: add ECC chipkill syndrome mapping table
  amd64_edac: add per-family descriptors
  amd64_edac: add F10h-and-later methods-p3
  amd64_edac: add F10h-and-later methods-p2
  amd64_edac: add F10h-and-later methods-p1
  amd64_edac: add k8-specific methods
  amd64_edac: assign DRAM chip select base and mask in a family-specific way
  amd64_edac: add helper to dump relevant registers
  amd64_edac: add DRAM address type conversion facilities
  amd64_edac: add functionality to compute the DRAM hole
  amd64_edac: add sys addr to memory controller mapping helpers
  amd64_edac: add memory scrubber interface
  amd64_edac: add MCA error types
  ...

1 files changed, 10 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 84285b5ba359..ccdb57524e3c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1979,6 +1979,16 @@ F:	Documentation/edac.txt
 F:      drivers/edac/edac_*
 F:      include/linux/edac.h
 
+EDAC-AMD64
+P:      Doug Thompson
+M:      dougthompson@xmission.com
+P:      Borislav Petkov
+M:      borislav.petkov@amd.com
+L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
+W:      bluesmoke.sourceforge.net
+S:      Supported
+F:      drivers/edac/amd64_edac*
+
 EDAC-E752X
 P:      Mark Gross
 M:      mark.gross@intel.com