summaryrefslogtreecommitdiff
path: root/Licenses
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-12-31 15:10:36 -0500
committerTom Rini <trini@ti.com>2014-12-31 15:10:36 -0500
commitb7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331 (patch)
tree47dc3ac1f5dbdf54d1f622f5b83d174ff35e0556 /Licenses
parent6d76e2aca82a0da47df80304211203f80b09f082 (diff)
parentedd88905ae292355991f13fd0d3c7b3368103050 (diff)
downloadu-boot-imx-b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331.zip
u-boot-imx-b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331.tar.gz
u-boot-imx-b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts: include/configs/arndale.h Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'Licenses')
0 files changed, 0 insertions, 0 deletions