Merge branch 'arm64-v3.10' into android-goldfish-3.10

Conflicts:
	arch/arm64/Makefile

Change-Id: Ia6c02d494d034a384f81f891440988cec6eb859e

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Makefile
index d69354dbd78945a4bd2725752195574df2e733bd,b6ccf8a36e2dec63586c16300f6d1a2d1b074f4b..cada8f8fe646b3455a77135722f5d8de517ac02c
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -65,9 -60,10 +65,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 d58ea71119e6de51d7595a3ab287553e77db2917,c52bdb051f664b64568d4a9bfddca2c43b8aa7f0..2f87014557cf57b943b07a4f287b08f600781d0f
--- 1/arch/arm64/boot/dts/Makefile
--- 2/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,15 -1,9 +1,16 @@@
  dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.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)
  
 -clean-files := *.dtb
 +dtbs: $(addprefix $(obj)/, $(DTB_LIST))
 +
 +clean-files := dts/*.dtb *.dtb

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

diff --cc arch/x86/Kconfig
Simple merge

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

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

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

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