Ingo Molnar 0ce74d9296 Merge branch 'linus' into timers/hrtimers ...

Conflicts:
	sound/drivers/pcsp/pcsp.c

Semantic conflict:

        sound/core/hrtimer.c

2008-12-29 10:37:07 +01:00

..

ftrace.c

ftrace: add not to regex on filtering functions

2008-12-18 12:57:09 +01:00

Kconfig

trace: add a way to enable or disable the stack tracer

2008-12-18 12:56:24 +01:00

Makefile

x86, bts, ftrace: adapt the hw-branch-tracer to the ds.c interface

2008-12-12 08:08:14 +01:00

ring_buffer.c

ring-buffer: prevent false positive warning

2008-12-23 18:45:26 +01:00

trace_boot.c

ftrace: introduce tracing_reset_online_cpus() helper

2008-12-19 16:29:34 +01:00

trace_branch.c

ftrace: replace raw_local_irq_save with local_irq_save

2008-12-03 08:56:19 +01:00

trace_functions_graph.c

tracing/function-graph-tracer: Output arrows signal on hardirq call/return

2008-12-12 11:14:09 +01:00

trace_functions.c

ftrace: introduce tracing_reset_online_cpus() helper

2008-12-19 16:29:34 +01:00

trace_hw_branches.c

ftrace: introduce tracing_reset_online_cpus() helper

2008-12-19 16:29:34 +01:00

trace_irqsoff.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_mmiotrace.c

ftrace: introduce tracing_reset_online_cpus() helper

2008-12-19 16:29:34 +01:00

trace_nop.c

tracing/ftrace: make nop tracer using tracer flags

2008-11-18 11:10:59 +01:00

trace_power.c

tracing: add "power-tracer": C/P state tracer to help power optimization

2008-11-26 08:29:32 +01:00

trace_sched_switch.c

sched, trace: update trace_sched_wakeup()

2008-12-25 13:10:21 +01:00

trace_sched_wakeup.c

sched, trace: update trace_sched_wakeup()

2008-12-25 13:10:21 +01:00

trace_selftest_dynamic.c

ftrace: fix dynamic ftrace selftest

2008-05-23 21:13:23 +02:00

trace_selftest.c

tracing/ftrace: change the type of the init() callback

2008-11-16 07:55:23 +01:00

trace_stack.c

trace: better use of stack_trace_enabled for boot up code

2008-12-18 12:56:56 +01:00

trace_sysprof.c

Merge branch 'linus' into timers/hrtimers

2008-12-29 10:37:07 +01:00

trace.c

Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-12-28 12:21:10 -08:00

trace.h

ftrace: introduce tracing_reset_online_cpus() helper

2008-12-19 16:29:34 +01:00