Merge branch 'linus' into x86/signal
Ingo Molnar [Sun, 12 Oct 2008 10:49:27 +0000 (12:49 +0200)]
Conflicts:
arch/x86/kernel/signal_64.c

1  2 
include/asm-x86/ptrace.h

Simple merge