From: Robert Richter <robert.richter@amd.com>
Date: Fri, 23 Apr 2010 14:47:51 +0000 (+0200)
Subject: Merge commit 'tip/tracing/core' into oprofile/core
X-Git-Tag: v2.6.35-rc1~523^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b971f06187d83b5c03d2b597cccdfef421c0ca91;p=pandora-kernel.git

Merge commit 'tip/tracing/core' into oprofile/core

Conflicts:
	drivers/oprofile/cpu_buffer.c

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

b971f06187d83b5c03d2b597cccdfef421c0ca91
Reading git-diff-tree failed