summaryrefslogtreecommitdiffstats
path: root/board/udoo/1066mhz_4x256mx16.cfg
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-03 08:36:29 -0400
committerTom Rini <trini@konsulko.com>2015-07-03 08:41:02 -0400
commit808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4 (patch)
tree8f45f687f0205be120412d87a63c36bda6ee8ae0 /board/udoo/1066mhz_4x256mx16.cfg
parent891b487098ee2169a16b1bbb354aaef28aa90630 (diff)
parentaa5a0d98943e1b32109fd1fb325007c6cdcedc50 (diff)
downloadtalos-obmc-uboot-808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4.tar.gz
talos-obmc-uboot-808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4.zip
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 'board/udoo/1066mhz_4x256mx16.cfg')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud