tree 4a73ee635bc3e35dc54f75caddd26ffb6238bb5c
parent 12a81c8df13c60904febcafcf6b90ca1acb67122
parent eb703f98191a505f78d0066712ad67d5dedc4c90
author Ingo Molnar <mingo@elte.hu> 1280990705 +0200
committer Ingo Molnar <mingo@elte.hu> 1280990705 +0200

Merge branch 'perf/nmi' into perf/core

Conflicts:
	kernel/Makefile

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

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