From: Kevin Hilman Date: Wed, 14 Aug 2013 15:14:50 +0000 (-0700) Subject: Merge branch 'zynq/dt' into next/dt X-Git-Tag: next-20130822~18^2~24^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047;p=karo-tx-linux.git Merge branch 'zynq/dt' into next/dt * zynq/dt: (1054 commits) arm: zynq: dt: Set correct L2 ram latencies + v3.11-rc5 Conflicts: arch/arm/Makefile --- 080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047 diff --cc arch/arm/Makefile index d1f717c59e70,6fd2ceae305a..a37a50f575a2 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -189,8 -190,10 +190,11 @@@ machine-$(CONFIG_ARCH_S5PV210) += s5pv machine-$(CONFIG_ARCH_SA1100) += sa1100 machine-$(CONFIG_ARCH_SHARK) += shark machine-$(CONFIG_ARCH_SHMOBILE) += shmobile +machine-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile + machine-$(CONFIG_ARCH_SIRF) += prima2 + machine-$(CONFIG_ARCH_SOCFPGA) += socfpga + machine-$(CONFIG_ARCH_STI) += sti + machine-$(CONFIG_ARCH_SUNXI) += sunxi machine-$(CONFIG_ARCH_TEGRA) += tegra machine-$(CONFIG_ARCH_U300) += u300 machine-$(CONFIG_ARCH_U8500) += ux500