Ingo Molnar c1ab9cab75 Merge branch 'linus' into tracing/core ... Conflicts: include/linux/module.h kernel/module.c Semantic conflict: include/trace/events/module.h Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up possibly racy module refcounting") Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-04-08 10:18:47 +02:00
..
buffer_sync.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
buffer_sync.h	cpumask: modifiy oprofile initialization	2009-01-22 14:37:06 +01:00
cpu_buffer.c	ring-buffer: Add place holder recording of dropped events	2010-03-31 22:57:04 -04:00
cpu_buffer.h	percpu: make percpu symbols in oprofile unique	2009-10-29 22:34:13 +09:00
event_buffer.c	oprofile: warn on freeing event buffer too early	2009-10-09 21:32:05 +02:00
event_buffer.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile	2008-10-23 10:05:40 -07:00
oprof.c	oprofile: Adding switch counter to oprofile statistic variables	2009-07-20 16:43:21 +02:00
oprof.h	oprofile: Rename variable timeout_jiffies and move to oprofile_files.c	2009-07-20 16:43:19 +02:00
oprofile_files.c	oprofile: Remove oprofile_multiplexing_init()	2009-07-20 16:43:19 +02:00
oprofile_stats.c	percpu: make percpu symbols in oprofile unique	2009-10-29 22:34:13 +09:00
oprofile_stats.h	oprofile: Adding switch counter to oprofile statistic variables	2009-07-20 16:43:21 +02:00
oprofilefs.c	const: mark remaining super_operations const	2009-09-22 07:17:24 -07:00
timer_int.c	oprofile: fixing whitespaces in drivers/oprofile/*	2008-10-16 15:01:40 +02:00