From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sat, 17 Oct 2009 23:09:09 +0000 (+0200)
Subject: Merge commit 'perf/core' into perf/hw-breakpoint
X-Git-Tag: v2.6.33-rc1~399^2~146^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f8f86c7bdd1c954fbe153af437a0d91a6c5721a;p=pandora-kernel.git

Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
---

0f8f86c7bdd1c954fbe153af437a0d91a6c5721a
Reading git-diff-tree failed