Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 09:35:12 +0000 (10:35 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 09:35:12 +0000 (10:35 +0100)
Conflicts:
kernel/trace/trace_hw_branches.c


Trivial merge