Merge branch 'linus' into x86/signal
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:49:27 +0000 (12:49 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:49:27 +0000 (12:49 +0200)
commit1389ac4b976abdc0555280dfc1aa2c3abcc19641
tree1ec51aa0b1e33201f6f4f3bebc657f9ec65f8539
parent69e13ad56f9e2cd81c4f8bfd6267211c10c14c08
parentfd048088306656824958e7783ffcee27e241b361
Merge branch 'linus' into x86/signal

Conflicts:
arch/x86/kernel/signal_64.c
include/asm-x86/ptrace.h