From: Ingo Molnar Date: Sat, 6 Sep 2008 12:53:01 +0000 (+0200) Subject: Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal X-Git-Tag: v2.6.28-rc1~699^2^2^2~4^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=046fd53773cd87125f799b00422e487bf1428d38;p=pandora-kernel.git Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal Conflicts: arch/x86/kernel/signal_64.c Signed-off-by: Ingo Molnar --- 046fd53773cd87125f799b00422e487bf1428d38 Reading git-diff-tree failed