diff options
| author | Ingo Molnar | 2008-10-12 13:20:25 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-10-12 13:20:25 +0200 |
| commit | eceb1383361c6327cef4de01d278cd6722ebceeb (patch) | |
| tree | 1ef63775514e6085e2cbe32391d458b2c6b21737 /include/asm-x86/spinlock.h | |
| 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 | kernel-qcow2-linux-eceb1383361c6327cef4de01d278cd6722ebceeb.tar.gz kernel-qcow2-linux-eceb1383361c6327cef4de01d278cd6722ebceeb.tar.xz kernel-qcow2-linux-eceb1383361c6327cef4de01d278cd6722ebceeb.zip | |
Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen
Conflicts:
include/asm-x86/spinlock.h