tree 222d7dd8fd300925cbf12cdc0fba5bee2528997e
parent 6f2f3cf00ee32f75ba007a46bab88a54d68a5deb
parent 78af08d90b8f745044b1274430bc4bc6b2b27aca
author Ingo Molnar <mingo@elte.hu> 1247912397 +0200
committer Ingo Molnar <mingo@elte.hu> 1247912401 +0200

Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on an older, pre-rc1 base.

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