Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Tue, 10 Mar 2015 23:09:18 +0000 (19:09 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 10 Mar 2015 23:09:18 +0000 (19:09 -0400)
commitb79dadf846e5e140e261bbfa4decd024357702d7
treebbfed4207c806f34ceb4b608e62cc4fbfa98f91f
parent1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d
parentd5338c693e6a35a7108c184839d688a7377d117c
Merge branch 'master' of git://git.denx.de/u-boot-tegra

Conflicts:
README

Signed-off-by: Tom Rini <trini@konsulko.com>
README
arch/arm/cpu/armv8/start.S
arch/arm/include/asm/macro.h
common/board_f.c
include/configs/ls2085a_common.h
include/configs/tegra-common.h