]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'x86/spinlocks' into auto-latest
authorIngo Molnar <mingo@elte.hu>
Tue, 9 Aug 2011 09:55:36 +0000 (11:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 9 Aug 2011 09:55:36 +0000 (11:55 +0200)
commit6f8fa39c81f12d98540598db42a1eaff65bba0ce
tree499106d86dc52a8034cfe14ad39dc3cde4975416
parent4977f9bf2d9b511d36199ab3451a2592d6bc3793
parent599c3e7724ab4520c6f11857eb953271d365f842
Merge branch 'x86/spinlocks' into auto-latest

Conflicts:
arch/x86/include/asm/cmpxchg_32.h
arch/x86/include/asm/cmpxchg_64.h
arch/x86/include/asm/cmpxchg_32.h
arch/x86/include/asm/cmpxchg_64.h
arch/x86/include/asm/spinlock.h
arch/x86/include/asm/spinlock_types.h