From: Ingo Molnar Date: Sun, 12 Oct 2008 11:20:25 +0000 (+0200) Subject: Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen X-Git-Tag: v2.6.28-rc1~699^2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eceb1383361c6327cef4de01d278cd6722ebceeb;p=pandora-kernel.git Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen Conflicts: include/asm-x86/spinlock.h --- eceb1383361c6327cef4de01d278cd6722ebceeb Reading git-diff-tree failed