tree ff31986115075410d0479df307a6b9841976026c
parent 4ad476e11f94fd3724c6e272d8220e99cd222b27
parent 57794a9d48b63e34acbe63282628c9f029603308
author Ingo Molnar <mingo@elte.hu> 1234172112 +0100
committer Ingo Molnar <mingo@elte.hu> 1234172112 +0100

Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Conflicts:
	kernel/trace/trace_hw_branches.c