Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2 ... Merge reason: we have gathered quite a few conflicts, need to merge upstream Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-06 09:02:57 +02:00
..
backtrace.c	oprofile: fixing whitespaces in arch/x86/oprofile/*	2008-10-16 17:17:46 +02:00
init.c	x86: coding style fixes to arch/x86/oprofile/init.c	2008-04-17 17:40:49 +02:00
Makefile	x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c	2008-07-26 11:48:14 +02:00
nmi_int.c	perfcounters: fix "perf counters kill oprofile" bug	2009-02-04 17:36:18 +01:00
nmi_timer_int.c	x86: coding style fixes to arch/x86/oprofile/nmi_timer_int.c	2008-04-17 17:40:50 +02:00
op_counter.h	oprofile: fixing whitespaces in arch/x86/oprofile/*	2008-10-16 17:17:46 +02:00
op_model_amd.c	oprofile: make new cpu buffer functions part of the api	2009-01-07 22:48:15 +01:00
op_model_p4.c	cpumask: x86: convert cpu_sibling_map/cpu_core_map to cpumask_var_t	2009-03-13 14:49:50 +10:30
op_model_ppro.c	Merge commit 'v2.6.29-rc7' into perfcounters/core	2009-03-04 11:42:31 +01:00
op_x86_model.h	Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip	2008-10-15 22:19:41 +02:00