diff options
author | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
commit | b79dadf846e5e140e261bbfa4decd024357702d7 (patch) | |
tree | bbfed4207c806f34ceb4b608e62cc4fbfa98f91f /common/update.c | |
parent | 1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d (diff) | |
parent | d5338c693e6a35a7108c184839d688a7377d117c (diff) | |
download | u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.zip u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.tar.gz u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
README
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/update.c')
0 files changed, 0 insertions, 0 deletions