Merge commit 'v2.6.28' into core/core

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 022cd41ea9b4..202864ad49a7 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type)
                 *cpu_type = "i386/pii";
                 break;
         case 6 ... 8:
+        case 10 ... 11:
                 *cpu_type = "i386/piii";
                 break;
         case 9:
+        case 13:
                 *cpu_type = "i386/p6_mobile";
                 break;
-        case 10 ... 13:
-                *cpu_type = "i386/p6";
-                break;
         case 14:
                 *cpu_type = "i386/core";
                 break;