]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/spinlocks' into auto-latest
authorIngo Molnar <mingo@elte.hu>
Thu, 29 Sep 2011 15:38:11 +0000 (17:38 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 29 Sep 2011 15:38:11 +0000 (17:38 +0200)
1  2 
arch/x86/include/asm/uv/uv_bau.h

Simple merge