| commit | c7a27aa4652c63172489a73f3961455650a79a7f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Sep 27 09:48:44 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Sep 27 09:48:44 2010 +0200 |
| tree | 9251ba2b3477db1a46b51e0a3ab9c415cd9432cc | |
| parent | 63e6be6d98e1a2bcdca86872b67052e51ab6afa1 [diff] | |
| parent | bb7ab785ad05a97a2c9ffb3a06547ed39f3133e8 [diff] |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 009b819..f1575c9 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c
@@ -674,6 +674,7 @@ case 0x0f: case 0x16: case 0x17: + case 0x1d: *cpu_type = "i386/core_2"; break; case 0x1a: