]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 11:20:25 +0000 (13:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 11:20:25 +0000 (13:20 +0200)
commit7fb2811d80485770029d0ead6481d70ab255455f
tree1ef63775514e6085e2cbe32391d458b2c6b21737
parent9259f82070e72402a7dcf1cb49365c48356e1aaa
parent74db9c40c2e15a4894dcd3707aefd124911e2ef8
parentf39a66cc1da7b11160c5e5fc31e96d31e6b2872d
Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen

Conflicts:
include/asm-x86/spinlock.h
arch/x86/kernel/process_64.c
include/asm-x86/spinlock.h