Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
board/armltd/vexpress64/vexpress64.c
Signed-off-by: NTom Rini <trini@konsulko.com>
Showing
想要评论请 注册 或 登录
Conflicts:
board/armltd/vexpress64/vexpress64.c
Signed-off-by: NTom Rini <trini@konsulko.com>