tree e65b1f3d4c751baa840efc81bc4734f089379eb3
parent fb82ad719831db58e9baa4c67015aae3fe27e7e3
parent 85dfd81dc57e8183a277ddd7a56aa65c96f3f487
author Ingo Molnar <mingo@elte.hu> 1249993149 +0200
committer Ingo Molnar <mingo@elte.hu> 1249993149 +0200

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>