Ingo Molnar 940010c5a3 Merge branch 'linus' into perfcounters/core ...

Conflicts:
	arch/x86/kernel/irqinit.c
	arch/x86/kernel/irqinit_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/fault.c
	include/linux/sched.h
	kernel/exit.c

2009-06-11 17:55:42 +02:00

..

backtrace.c

x86, 32-bit: fix kernel_trap_sp()

2009-05-12 00:39:52 +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

Merge branch 'linus' into perfcounters/core

2009-06-11 17:55:42 +02: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