tree d261058d95d27fe7250511d5fad69db30dc17731
parent 5872144f64b34a5942f6b4acedc90b02de72c58b
parent 1406de8e11eb043681297adf86d6892ff8efc27a
author Ingo Molnar <mingo@elte.hu> 1242634509 +0200
committer Ingo Molnar <mingo@elte.hu> 1242634535 +0200

Merge commit 'v2.6.30-rc6' into tracing/core

Merge reason: we were on an -rc4 base, sync up to -rc6

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