]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commit206855c321adee56db3946ca09a5887cddb9d598
tree13a2729d4d0e37170552bd9ad3c6bba71ba0c55c
parente8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508
parentcb58ffc3889f0545628f138f849e759a331b8ddc
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