Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm64/Makefile

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Makefile
index 8cf59039ad8bb76d76c990d57f3133cd5597d05a,a254d2c2c0dc36a8a87866659ffd35f8bc2e95cd..27ad9166d012f0ca082be8417385c96b62a07ffe
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -71,9 -66,10 +71,13 @@@ zinstall install: vmlinu
  dtbs: scripts
        $(Q)$(MAKE) $(build)=$(boot)/dts dtbs
  
 +Image.gz-dtb: vmlinux scripts dtbs
 +      $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 +
+ PHONY += vdso_install
+ vdso_install:
+       $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
+ 
  # We use MRPROPER_FILES and CLEAN_FILES now
  archclean:
        $(Q)$(MAKE) $(clean)=$(boot)

diff --cc arch/arm64/boot/dts/Makefile
index 9a98a3a6e0b0ab50f62f103b5798982ce00b9b17,ef388176116d2c7ea3cdc3f66fd6d63001f3f278..4f197a097dcff5098e1ad9e62d87a331cb7477bf
--- 1/arch/arm64/boot/dts/Makefile
--- 2/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,17 -1,11 +1,18 @@@
  dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
                                fvp-base-gicv2-psci.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb
+ dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
  
  targets += dtbs
 -targets += $(dtb-y)
  
 -dtbs: $(addprefix $(obj)/, $(dtb-y))
 +DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES))
 +ifneq ($(DTB_NAMES),)
 +DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
 +else
 +DTB_LIST := $(dtb-y)
 +endif
 +targets += $(DTB_LIST)
 +
 +dtbs: $(addprefix $(obj)/, $(DTB_LIST))
  
  clean-files := *.dtb

diff --cc arch/arm64/include/asm/cmpxchg.h
Simple merge

diff --cc drivers/of/fdt.c
Simple merge

diff --cc include/linux/of_fdt.h
Simple merge