Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 22 May 2014 10:38:24 +0000 (11:38 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 22 May 2014 10:38:24 +0000 (11:38 +0100)
1  2 
arch/arm64/Kconfig
arch/arm64/include/asm/cmpxchg.h

Simple merge
Simple merge