Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent

This commit is contained in:
Ingo Molnar
2010-09-27 09:48:44 +02:00

View File

@@ -674,6 +674,7 @@ static int __init ppro_init(char **cpu_type)
case 0x0f: case 0x0f:
case 0x16: case 0x16:
case 0x17: case 0x17:
case 0x1d:
*cpu_type = "i386/core_2"; *cpu_type = "i386/core_2";
break; break;
case 0x1a: case 0x1a: