From: Robert Richter <robert.richter@amd.com>
Date: Wed, 15 Oct 2008 20:19:41 +0000 (+0200)
Subject: Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip
X-Git-Tag: v2.6.28-rc1~35^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a289395bf753f8a318d3a5fa335a757c16c0183;p=pandora-kernel.git

Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip

Conflicts:
	arch/x86/oprofile/op_model_ppro.c
---

5a289395bf753f8a318d3a5fa335a757c16c0183
Reading git-diff-tree failed