Robert Richter debc6a6927 Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core ...

Conflicts:
	drivers/oprofile/oprofile_stats.c
	drivers/usb/otg/Kconfig
	drivers/usb/otg/Makefile

Signed-off-by: Robert Richter <robert.richter@amd.com>

2009-07-14 15:20:44 +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 commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core

2009-07-14 15:20:44 +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

x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs()

2009-06-18 16:44:38 +02:00

op_model_p4.c

x86/oprofile: use 64 bit wrmsr functions

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

op_model_ppro.c

Merge commit 'tip/perfcounters-for-linus' into oprofile/master

2009-06-12 17:58:48 +02:00

op_x86_model.h

Merge commit 'tip/perfcounters-for-linus' into oprofile/master

2009-06-12 17:58:48 +02:00