tmp_suning_uos_patched/drivers/oprofile
Ingo Molnar f0ef039851 Merge branch 'x86/core' into tracing/textedit
Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-06 16:45:01 +01:00
..
buffer_sync.c cpumask: convert misc driver functions 2009-01-11 19:12:52 +01:00
buffer_sync.h cpumask: convert misc driver functions 2009-01-11 19:12:52 +01:00
cpu_buffer.c ring_buffer: remove unused flags parameter, fix 2009-02-06 01:14:05 +01:00
cpu_buffer.h oprofile: fix uninitialized use of struct op_entry 2009-01-17 17:26:39 +01:00
event_buffer.c oprofile: rename kernel-wide identifiers 2008-12-16 17:52:49 +01: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 cpumask: convert misc driver functions 2009-01-11 19:12:52 +01:00
oprof.h oprofile: rename kernel-wide identifiers 2008-12-16 17:52:49 +01:00
oprofile_files.c oprofile: rename kernel-wide identifiers 2008-12-16 17:52:49 +01:00
oprofile_stats.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofile_stats.h oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofilefs.c zero i_uid/i_gid on inode allocation 2009-01-05 11:54:28 -05:00
timer_int.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00