From: Robert Richter <robert.richter@amd.com>
Date: Fri, 12 Jun 2009 15:58:48 +0000 (+0200)
Subject: Merge commit 'tip/perfcounters-for-linus' into oprofile/master
X-Git-Tag: v2.6.32-rc1~721^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1241eb8f136bf3ea409f61590e7663465906d158;p=pandora-kernel.git

Merge commit 'tip/perfcounters-for-linus' into oprofile/master

Conflicts:
	arch/x86/oprofile/op_model_ppro.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
---

1241eb8f136bf3ea409f61590e7663465906d158
Reading git-diff-tree failed