Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 18 May 2014 17:46:41 +0000 (18:46 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 18 May 2014 17:46:41 +0000 (18:46 +0100)
commitc877dd285464741cb4c87d07bfcb924d8acf4af3
tree2d9619036694fc9ddee510be4922ac6c7e472b6e
parent5b301892983be4434690a2440282e2aca87662c3
parent887191f9ae57f7adb3b4540a096f90f358d8e339
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
arch/arm64/Makefile
arch/arm64/Kconfig
arch/arm64/Makefile
arch/arm64/boot/dts/Makefile
arch/arm64/include/asm/cmpxchg.h
drivers/of/fdt.c
include/linux/of_fdt.h