tree 9a290f1742526a8816f94560cb09bc0a09c910de
parent e4e91ac410356da3a518188f371e9d3b52ee38ee
parent ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556
author Ingo Molnar <mingo@elte.hu> 1290780422 +0100
committer Ingo Molnar <mingo@elte.hu> 1290780422 +0100

Merge branch 'perf/urgent' into perf/core

Conflicts:
	arch/x86/kernel/apic/hw_nmi.c

Merge reason: Resolve conflict, queue up dependent patch.

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