From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 5 Aug 2010 06:45:05 +0000 (+0200)
Subject: Merge branch 'perf/nmi' into perf/core
X-Git-Tag: v2.6.36-rc1~532^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61be7fdec2f51b99570cd5dcc30c7848c8e56513;p=pandora-kernel.git

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>
---

61be7fdec2f51b99570cd5dcc30c7848c8e56513
Reading git-diff-tree failed