Merge branch 'perf/nmi' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
Conflicts:
kernel/Makefile

Merge reason: Add the now complete topic, fix the conflict.

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

Trivial merge