From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 5 Jun 2014 09:18:34 +0000 (+0200)
Subject: Merge branch 'perf/kprobes' into perf/core
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~34^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10b0256496fd6c162478547f7c6df1e052e87644;p=pandora-kernel.git

Merge branch 'perf/kprobes' into perf/core

Conflicts:
	arch/x86/kernel/traps.c

The kprobes enhancements are fully cooked, ship them upstream.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

10b0256496fd6c162478547f7c6df1e052e87644
Reading git-diff-tree failed