Merge branch 'tracing/hw-branch-tracing' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 7 May 2009 09:18:34 +0000 (11:18 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 7 May 2009 11:36:22 +0000 (13:36 +0200)
commit0ad5d703c6c0fcd385d956555460df95dff7eb7e
tree4b777100f9be4fe90ca4bd043b9f98df672b5b3b
parent44347d947f628060b92449702071bfe1d31dfb75
parent1cb81b143fa8f0e4629f10690862e2e52ca792ff
Merge branch 'tracing/hw-branch-tracing' into tracing/core

Merge reason: this topic is ready for upstream now. It passed
              Oleg's review and Andrew had no further mm/*
              objections/observations either.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/sched.h
kernel/fork.c
kernel/ptrace.c
kernel/sched.c
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_hw_branches.c