tree b02f0a55bf98aa5e7d44698cc80e23a01a41edef
parent 1e9b51c28312f7334394aa30be56ff52c2b65b7e
parent 14bfc987e395797dfe03e915e8b4c7fc9e5078e4
author Ingo Molnar <mingo@elte.hu> 1227661085 +0100
committer Ingo Molnar <mingo@elte.hu> 1227661085 +0100

Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing/core