From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 2 Sep 2009 19:42:56 +0000 (+0200)
Subject: Merge branch 'perfcounters/urgent' into perfcounters/core
X-Git-Tag: v2.6.32-rc1~720^2~16
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f76bd108e5031202bb40849306f98c4afebe4ef6;p=net-next-2.6.git

Merge branch 'perfcounters/urgent' into perfcounters/core

Merge reason: We are going to modify a place modified by
              perfcounters/urgent.

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

f76bd108e5031202bb40849306f98c4afebe4ef6