Ingo Molnar accba5f396 Merge branch 'linus' into oprofile-v2 ... Conflicts: arch/x86/kernel/apic_32.c arch/x86/oprofile/nmi_int.c include/linux/pci_ids.h		2008-10-13 11:05:51 +02:00
..
backtrace.c
init.c
Makefile	x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c	2008-07-26 11:48:14 +02:00
nmi_int.c	Merge branch 'linus' into oprofile-v2	2008-10-13 11:05:51 +02:00
nmi_timer_int.c
op_counter.h
op_model_amd.c	x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c	2008-07-26 11:48:14 +02:00
op_model_p4.c	x86: Coding style fixes to arch/x86/oprofile/op_model_p4.c	2008-08-19 03:33:51 +02:00
op_model_ppro.c
op_x86_model.h	x86/oprofile: renaming athlon_*() into op_amd_*()	2008-07-26 11:48:02 +02:00