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

…

Makefile

…

nmi_int.c

Merge branch 'linus' into perfcounters/core

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

nmi_timer_int.c

…

op_counter.h

…

op_model_amd.c

…

op_model_p4.c

…

op_model_ppro.c

…

op_x86_model.h

…