James Morris 2b82892565 Merge branch 'master' into next ... Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>		2008-11-14 11:29:12 +11:00
..
ftrace.c	ftrace: perform an initialization for ftrace to enable it	2008-10-28 19:15:58 +01:00
Kconfig	tracing, alpha: undefined reference to `save_stack_trace'	2008-11-03 10:12:13 +01:00
Makefile	ftrace: rename FTRACE to FUNCTION_TRACER	2008-10-20 18:27:03 +02:00
ring_buffer.c	ring-buffer: prevent infinite looping on time stamping	2008-11-10 21:47:37 -05:00
trace_boot.c	tracing/fastboot: fix printk format typo in boot tracer	2008-10-14 10:39:23 +02:00
trace_functions.c	ftrace: rename the ftrace tracer to function	2008-10-20 18:27:04 +02:00
trace_irqsoff.c	ftrace: rename FTRACE to FUNCTION_TRACER	2008-10-20 18:27:03 +02:00
trace_mmiotrace.c	ftrace: preempt disable over interrupt disable	2008-10-14 10:39:09 +02:00
trace_nop.c	ftrace: make work with new ring buffer	2008-10-14 10:38:57 +02:00
trace_sched_switch.c	ftrace: make some tracers reentrant	2008-10-14 10:39:20 +02:00
trace_sched_wakeup.c	ftrace: rename FTRACE to FUNCTION_TRACER	2008-10-20 18:27:03 +02:00
trace_selftest_dynamic.c	ftrace: fix dynamic ftrace selftest	2008-05-23 21:13:23 +02:00
trace_selftest.c	ftrace: remove daemon	2008-10-23 16:00:22 +02:00
trace_stack.c	ftrace: stack tracer only record when on stack	2008-10-20 18:31:37 +02:00
trace_sysprof.c	ftrace: make work with new ring buffer	2008-10-14 10:38:57 +02:00
trace.c	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
trace.h	ftrace: handle archs that do not support irqs_disabled_flags	2008-10-31 00:03:26 +01:00