]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/urgent' into core/signal
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 09:32:17 +0000 (11:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 09:32:17 +0000 (11:32 +0200)
commit0ad21b9d133c572c79e3d1525092c301adef1b42
tree13a2729d4d0e37170552bd9ad3c6bba71ba0c55c
parent7e0f221fd770f77fa04620239c99d67a58275956
parent46ded31a8636465b149384e55d9008e1f48e51ea
Merge branch 'x86/urgent' into core/signal

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