Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz...

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/Makefile
index 24be4296c14c72f089606bce77bbf261118d0e44,8dc5d8e28a01138f49dc27ab7de2b93e14fad044..0f3c0d20c7602700dd5515e39d27f9d0d9a52ba3
--- 1/arch/arm64/boot/dts/Makefile
--- 2/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,9 -1,15 +1,16 @@@
 -dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 +dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
 +                              fvp-base-gicv2-psci.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 drivers/cpufreq/cpufreq_interactive.c
Simple merge

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

diff --cc net/ipv4/tcp.c
Simple merge