Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:31:13 +0000 (10:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:31:13 +0000 (10:31 +1100)
1  2 
arch/mips/include/asm/atomic.h

Simple merge