From: Ingo Molnar Date: Sun, 12 Oct 2008 10:49:27 +0000 (+0200) Subject: Merge branch 'linus' into x86/signal X-Git-Tag: v2.6.28-rc1~699^2^2^2^2 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=1389ac4b976abdc0555280dfc1aa2c3abcc19641;p=safe%2Fjmp%2Flinux-2.6 Merge branch 'linus' into x86/signal Conflicts: arch/x86/kernel/signal_64.c --- 1389ac4b976abdc0555280dfc1aa2c3abcc19641