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

…

Kconfig

…

Makefile

…

trace_functions.c

…

trace_irqsoff.c

…

trace_mmiotrace.c

…

trace_sched_switch.c

…

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_sysprof.c

…

trace.c

…

trace.h

…