summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-26 14:03:08 -0400
committerTom Rini <trini@ti.com>2014-10-26 14:03:08 -0400
commit84a6df09c78bc9e9cbc6265d99c9097f5f1079f2 (patch)
tree3b2bf1b3689e9aad0d20f5a69ada168cae3cc769 /README
parentc69ecd9722af22d50295eff81d0b9cd5b8adc2e0 (diff)
parentc2ded962d4703a3f9522553004db4a6fe540f7e6 (diff)
downloadu-boot-imx-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.zip
u-boot-imx-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.tar.gz
u-boot-imx-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.tar.bz2
Merge git://git.denx.de/u-boot-dm
Fix a trivial conflict over adding <dm.h> Conflicts: arch/arm/cpu/armv7/omap3/board.c Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions