From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 26 Nov 2010 14:07:02 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v2.6.38-rc1~490^2~80
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c869e772c72d509d0db243a56c205ef48a29baf;p=pandora-kernel.git

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

6c869e772c72d509d0db243a56c205ef48a29baf
Reading git-diff-tree failed