Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 17:02:00 +0000 (18:02 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 17:02:00 +0000 (18:02 +0100)
1  2 
arch/arm64/Kconfig
arch/arm64/include/asm/cmpxchg.h

Simple merge
Simple merge