tree ec5af7a70f58ad27ad21fc27815ca164ccf92c36
parent dcef788eb9659b61a2110284fcce3ca6e63480d2
parent 93cfb3c9fd83d877a8f1ffad9ff862b617b32828
author Ingo Molnar <mingo@elte.hu> 1239360388 +0200
committer Ingo Molnar <mingo@elte.hu> 1239360411 +0200

Merge branch 'tracing/urgent' into tracing/core

Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
              and pick up the current lineup of tracing/urgent fixes as well

Signed-off-by: Ingo Molnar <mingo@elte.hu>