From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 21 Nov 2009 13:07:23 +0000 (+0100)
Subject: Merge branch 'tracing/hw-breakpoints' into perf/core
X-Git-Tag: v2.6.33-rc1~399^2~146
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96200591a34f8ecb98481c626125df43a2463b55;p=pandora-kernel.git

Merge branch 'tracing/hw-breakpoints' into perf/core

Conflicts:
	arch/x86/kernel/kprobes.c
	kernel/trace/Makefile

Merge reason: hw-breakpoints perf integration is looking
              good in testing and in reviews, plus conflicts
              are mounting up - so merge & resolve.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

96200591a34f8ecb98481c626125df43a2463b55
Reading git-diff-tree failed