Commit c7a27aa4 authored Sep 27, 2010 by Ingo Molnar

Merge branch 'urgent' of...

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

arch/x86/oprofile/nmi_int.c

+1 −0

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