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)
commit080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047
tree2a367e97dcffe9ced54ff71b03ab893a3248fdb4
parente91f24ae027a583f2faff84456fa2630144bfed8
parent39c41df9c1950fba0ee6a4e7a63be281e89fe437
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
arch/arm/Makefile
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-lager.c
arch/arm/mach-shmobile/smp-emev2.c