projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e91f24a 39c41df)
Merge branch 'zynq/dt' into next/dt
authorKevin Hilman <khilman@linaro.org>
Wed, 14 Aug 2013 15:14:50 +0000 (08:14 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 14 Aug 2013 15:14:50 +0000 (08:14 -0700)
* zynq/dt: (1054 commits)
  arm: zynq: dt: Set correct L2 ram latencies
  + v3.11-rc5

Conflicts:
arch/arm/Makefile

1  2 
arch/arm/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-armadillo800eva.c patch | diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-lager.c patch | diff1 | diff2 | blob | history
arch/arm/mach-shmobile/smp-emev2.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Makefile
index d1f717c59e7087ac543281831d9556c02e54ad61,6fd2ceae305a6a5cf6c5d2e766e4c91848b147f7..a37a50f575a27af2c95abca5c473d6a60233d8b9
--- 1/arch/arm/Makefile
--- 2/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
diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge
diff --cc arch/arm/mach-shmobile/smp-emev2.c
Simple merge