From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 24 Apr 2009 08:11:18 +0000 (+0200)
Subject: Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
X-Git-Tag: v2.6.31-rc1~401^2~62^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=416dfdcdb894432547ead4fcb9fa6a36b396059e;p=pandora-kernel.git

Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

Conflicts:
	arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
              dependency change from upstream so that we can remove it
	      here.

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

416dfdcdb894432547ead4fcb9fa6a36b396059e
Reading git-diff-tree failed