Ingo Molnar 89034bc2c7 Merge branch 'linus' into tracing/core ...

Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

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

2009-08-11 14:19:09 +02:00

..

events

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

2009-07-14 18:34:32 -07:00

boot.h

tracing/fastboot: include missing headers

2008-12-12 09:26:13 +01:00

define_trace.h

tracing: remove deprecated TRACE_FORMAT

2009-04-24 11:50:39 -04:00

ftrace.h

Merge branch 'linus' into tracing/core

2009-08-11 14:19:09 +02:00

power.h

tracing: replace TP<var> with TP_<var>

2009-03-10 00:35:04 -04:00

syscall.h

tracing/syscalls: use a dedicated file header

2009-04-09 05:43:32 +02:00