]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit63ee218956d93d5cf8179231959ca9dab078a8b2
tree1ec51aa0b1e33201f6f4f3bebc657f9ec65f8539
parent56704b7224ed5ac92ca368933fd4258cb71881b0
parent6e42ac2e0be8d41a79b271628b2ee664ddeb9534
Merge branch 'linus' into x86/signal

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