From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 15 Aug 2008 15:07:34 +0000 (+0200)
Subject: Merge branch 'linus' into x86/tracehook
X-Git-Tag: v2.6.28-rc1~734^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04197c83b3e05546d1003cfa3ff43f1639c0057f;p=pandora-kernel.git

Merge branch 'linus' into x86/tracehook

Conflicts:
	arch/x86/Kconfig

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

04197c83b3e05546d1003cfa3ff43f1639c0057f
Reading git-diff-tree failed