Robert Richter f78e80209c Merge commit 'v2.6.27-rc5' into tip/oprofile ...

Conflicts:
	arch/x86/oprofile/nmi_int.c

2008-09-24 11:25:31 +02:00

..

backtrace.c

x86: rename stack_pointer to kernel_trap_sp

2008-01-30 13:33:16 +01: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 commit 'v2.6.27-rc5' into tip/oprofile

2008-09-24 11:25:31 +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

Revert "Oprofile Multiplexing Patch"

2008-09-24 11:08:52 +02:00

op_model_amd.c

Revert "Oprofile Multiplexing Patch"

2008-09-24 11:08:52 +02:00

op_model_p4.c

Revert "Oprofile Multiplexing Patch"

2008-09-24 11:08:52 +02:00

op_model_ppro.c

Revert "Oprofile Multiplexing Patch"

2008-09-24 11:08:52 +02:00

op_x86_model.h

Revert "Oprofile Multiplexing Patch"

2008-09-24 11:08:52 +02:00