diff --git a/[refs] b/[refs]
index f70d1c50dd19..23d4706def38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9c93813ac17b34ee6eb7a424578acae6f90d759
+refs/heads/master: 2a12652c0335ec90747d3402a82b6699ae883b58
diff --git a/trunk/arch/i386/oprofile/nmi_int.c b/trunk/arch/i386/oprofile/nmi_int.c
index 8fda7be9dd4d..695f737516ae 100644
--- a/trunk/arch/i386/oprofile/nmi_int.c
+++ b/trunk/arch/i386/oprofile/nmi_int.c
@@ -414,6 +414,10 @@ int __init op_nmi_init(struct oprofile_operations *ops)
 				   user space an consistent name. */
 				cpu_type = "x86-64/hammer";
 				break;
+			case 0x10:
+				model = &op_athlon_spec;
+				cpu_type = "x86-64/family10";
+				break;
 			}
 			break;