tree 06204f2452e02ca916666173d50f5035d69065ef
parent 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01
parent ab86e5765d41a5eb4239a1c04d613db87bea5ed8
author Ingo Molnar <mingo@elte.hu> 1253213543 +0200
committer Ingo Molnar <mingo@elte.hu> 1253213590 +0200

Merge branch 'linus' into tracing/core

Merge reason: Pick up kernel/softirq.c update for dependent fix.

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