Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 6 Aug 2014 12:37:19 +0000 (13:37 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 6 Aug 2014 12:37:19 +0000 (13:37 +0100)
1  2 
arch/arm64/include/asm/cmpxchg.h

Simple merge