From: Ingo Molnar Date: Mon, 6 Oct 2008 16:16:40 +0000 (+0200) Subject: Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1 X-Git-Tag: v2.6.28-rc1~734^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b159d7a989e53ab3529084348aa80441520b8575;p=pandora-kernel.git Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1 Conflicts: arch/x86/kernel/signal_64.c Signed-off-by: Ingo Molnar --- b159d7a989e53ab3529084348aa80441520b8575 Reading git-diff-tree failed