diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 13:20:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 13:20:25 +0200 |
| commit | eceb1383361c6327cef4de01d278cd6722ebceeb (patch) | |
| tree | 1ef63775514e6085e2cbe32391d458b2c6b21737 /arch/x86/configs/i386_defconfig | |
| parent | Merge branch 'linus' into x86/xen (diff) | |
| parent | Merge branch 'x86/signal' into core/signal (diff) | |
| parent | Merge branch 'linus' into x86/spinlocks (diff) | |
| download | linux-eceb1383361c6327cef4de01d278cd6722ebceeb.tar.xz linux-eceb1383361c6327cef4de01d278cd6722ebceeb.zip | |
Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen
Conflicts:
include/asm-x86/spinlock.h