From: Robert Richter <robert.richter@amd.com>
Date: Fri, 15 Oct 2010 10:45:00 +0000 (+0200)
Subject: Merge remote branch 'tip/perf/core' into oprofile/core
X-Git-Tag: v2.6.37-rc1~214^2~18^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6268464b370e234e0255330190f9bd5d19386ad7;p=pandora-kernel.git

Merge remote branch 'tip/perf/core' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c
	kernel/perf_event.c
---

6268464b370e234e0255330190f9bd5d19386ad7
Reading git-diff-tree failed