diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-03 12:36:29 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-03 12:41:02 (GMT) |
| commit | 808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4 (patch) | |
| tree | 8f45f687f0205be120412d87a63c36bda6ee8ae0 /fs/cbfs/cbfs.c | |
| parent | 891b487098ee2169a16b1bbb354aaef28aa90630 (diff) | |
| parent | aa5a0d98943e1b32109fd1fb325007c6cdcedc50 (diff) | |
| download | u-boot-808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Conflicts:
configs/tbs2910_defconfig
configs/tqma6q_mba6_mmc_defconfig
configs/tqma6q_mba6_spi_defconfig
configs/tqma6s_mba6_mmc_defconfig
configs/tqma6s_mba6_spi_defconfig
include/configs/mx6_common.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'fs/cbfs/cbfs.c')
0 files changed, 0 insertions, 0 deletions