tree 4b777100f9be4fe90ca4bd043b9f98df672b5b3b
parent 44347d947f628060b92449702071bfe1d31dfb75
parent 1cb81b143fa8f0e4629f10690862e2e52ca792ff
author Ingo Molnar <mingo@elte.hu> 1241687914 +0200
committer Ingo Molnar <mingo@elte.hu> 1241696182 +0200

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>