diff --git a/[refs] b/[refs]
index 3e41f93a1b72..8797a39277ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28d16272b12e086664a8ca30d5877274a5f944b8
+refs/heads/master: e8765584156daef3e0ccd63dfa12466a8b75613d
diff --git a/trunk/drivers/edac/Kconfig b/trunk/drivers/edac/Kconfig
index 41d73ef2c962..865cb7b84967 100644
--- a/trunk/drivers/edac/Kconfig
+++ b/trunk/drivers/edac/Kconfig
@@ -190,4 +190,11 @@ config EDAC_PPC4XX
 	  PowerPC 4xx embedded processors such as the 405EX[r],
 	  440SP, 440SPe, 460EX, 460GT and 460SX.
 
+config EDAC_AMD8131
+	tristate "AMD8131 HyperTransport PCI-X Tunnel"
+	depends on EDAC_MM_EDAC && PCI
+	help
+	  Support for error detection and correction on the
+	  AMD8131 HyperTransport PCI-X Tunnel chip.
+
 endif # EDAC