| commit | 0333b1174e0272c3fb4a9b6cac7f9c2e826c6d58 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Fri, 22 Jul 2011 21:17:02 +0000 (22 23:17 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Fri, 22 Jul 2011 21:17:02 +0000 (22 23:17 +0200) | ||
| tree | 840cdf2ad8dc0e8a329e40b05183182db1645e29 | treesnapshot (tar.gz zip) |
| parent | f6642df69adef52e6c258583ccd086b350059a57 | commitdiff |
| parent | 599c3e7724ab4520c6f11857eb953271d365f842 | commitdiff |
Merge branch 'x86/spinlocks'
Conflicts:
arch/x86/include/asm/cmpxchg_32.h
arch/x86/include/asm/cmpxchg_64.h
Conflicts:
arch/x86/include/asm/cmpxchg_32.h
arch/x86/include/asm/cmpxchg_64.h