summaryrefslogtreecommitdiff
path: root/include/configs/socfpga_arria5.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-04-03 09:14:38 -0400
committerTom Rini <trini@konsulko.com>2015-04-03 09:14:38 -0400
commit692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 (patch)
treee47f18f7dd1507e91a46fcd6f550914ad3774f5a /include/configs/socfpga_arria5.h
parent8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 (diff)
parent76a30fedd44428c7108084266389c9b4ba5678c8 (diff)
downloadu-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.zip
u-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.gz
u-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts: board/armltd/vexpress64/vexpress64.c Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/socfpga_arria5.h')
0 files changed, 0 insertions, 0 deletions