summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 13:20:25 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-12 13:20:25 +0200
commiteceb1383361c6327cef4de01d278cd6722ebceeb (patch)
tree1ef63775514e6085e2cbe32391d458b2c6b21737 /lib
parent365d46dc9be9b3c833990a06f3994b1987eda578 (diff)
parent84e9c95ad92f7afcd960342b6012b0a1b039e21b (diff)
parent4c7145a1ec1bb789d5f07e47510e8bda546a7c4a (diff)
downloadconfigs-eceb1383361c6327cef4de01d278cd6722ebceeb.tar.gz
Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen
Conflicts: include/asm-x86/spinlock.h