summaryrefslogtreecommitdiff
path: root/scripts/multiconfig.sh
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-12-11 18:40:49 -0500
committerTom Rini <trini@ti.com>2014-12-11 18:40:49 -0500
commitfc9b0b80435cda721fbdbe507c9e4f388b0ea62b (patch)
treee50527455a67f1fc9f793f42d9672b237ac806f7 /scripts/multiconfig.sh
parent2c49323d5de38e119f102fa3f5fb291c4bc4e8a0 (diff)
parent0c6de8853b2571251fdefe34598e0c344fe1372b (diff)
downloadu-boot-imx-fc9b0b80435cda721fbdbe507c9e4f388b0ea62b.zip
u-boot-imx-fc9b0b80435cda721fbdbe507c9e4f388b0ea62b.tar.gz
u-boot-imx-fc9b0b80435cda721fbdbe507c9e4f388b0ea62b.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts: board/freescale/mx6sxsabresd/mx6sxsabresd.c Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'scripts/multiconfig.sh')
0 files changed, 0 insertions, 0 deletions