Merge branch 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 10:46:28 +0000 (12:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 10:46:51 +0000 (12:46 +0200)
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>

Trivial merge