diff --git a/[refs] b/[refs]
index b372800db777..64de0e80d006 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4e267c88b4acfc87ff2ab0cc8e9509878e9aaba
+refs/heads/master: 2e117604a4e8f3f9cee4aec3373b0382159e152a
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 249d1e0824b5..f9998d276eb3 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -586,6 +586,16 @@ config AMD_IOMMU
 	  your BIOS for an option to enable it or if you have an IVRS ACPI
 	  table.
 
+config AMD_IOMMU_STATS
+	bool "Export AMD IOMMU statistics to debugfs"
+	depends on AMD_IOMMU
+	select DEBUG_FS
+	help
+	  This option enables code in the AMD IOMMU driver to collect various
+	  statistics about whats happening in the driver and exports that
+	  information to userspace via debugfs.
+	  If unsure, say N.
+
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
 	def_bool y if X86_64