diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-08-14 19:14:50 +0400 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-08-14 19:14:50 +0400 |
commit | 080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047 (patch) | |
tree | 2a367e97dcffe9ced54ff71b03ab893a3248fdb4 /arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h | |
parent | e91f24ae027a583f2faff84456fa2630144bfed8 (diff) | |
parent | 39c41df9c1950fba0ee6a4e7a63be281e89fe437 (diff) | |
download | linux-080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047.tar.xz |
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
Diffstat (limited to 'arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h')
0 files changed, 0 insertions, 0 deletions