| commit | 1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Apr 10 12:46:28 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Apr 10 12:46:51 2009 +0200 |
| tree | ec5af7a70f58ad27ad21fc27815ca164ccf92c36 | |
| parent | dcef788eb9659b61a2110284fcce3ca6e63480d2 [diff] | |
| parent | 93cfb3c9fd83d877a8f1ffad9ff862b617b32828 [diff] |
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>