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)
commiteceb1383361c6327cef4de01d278cd6722ebceeb
tree1ef63775514e6085e2cbe32391d458b2c6b21737
parent365d46dc9be9b3c833990a06f3994b1987eda578
parent84e9c95ad92f7afcd960342b6012b0a1b039e21b
parent4c7145a1ec1bb789d5f07e47510e8bda546a7c4a
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