From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 15 Aug 2009 10:06:12 +0000 (+0200)
Subject: Merge branch 'perfcounters/urgent' into perfcounters/core
X-Git-Tag: v2.6.32-rc1~720^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be750231ce1599b86fbba213e3da8344ece262e2;p=pandora-kernel.git

Merge branch 'perfcounters/urgent' into perfcounters/core

Conflicts:
	kernel/perf_counter.c

Merge reason: update to latest upstream (-rc6) and resolve
              the conflict with urgent fixes.

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

be750231ce1599b86fbba213e3da8344ece262e2
Reading git-diff-tree failed