Ingo Molnar 9e3ee1c39c Merge branch 'linus' into cpus4096 ...

Conflicts:

	kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2008-07-28 23:32:00 +02:00

..

ftrace.c

stop_machine: fix up ftrace.c

2008-07-28 12:16:31 +10:00

Kconfig

…

Makefile

…

trace_functions.c

…

trace_irqsoff.c

ftrace: fix modular build

2008-07-26 15:08:22 +02:00

trace_mmiotrace.c

…

trace_sched_switch.c

…

trace_sched_wakeup.c

ftrace: fix 4d3702b6 (post-v2.6.26): WARNING: at kernel/lockdep.c:2731 check_flags (ftrace)

2008-07-18 13:47:15 +02:00

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_sysprof.c

cpumask: change cpumask_of_cpu_ptr to use new cpumask_of_cpu

2008-07-26 16:40:33 +02:00

trace.c

tracing: remove unused variable

2008-07-27 09:58:20 -07:00

trace.h

Merge branch 'tracing/ftrace' into auto-ftrace-next

2008-07-14 15:58:35 +02:00