summaryrefslogtreecommitdiff
path: root/board/ip04
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-11 09:59:27 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-11 09:59:27 +0200
commit5480ac32171ab0e38c48c9f585fa650c7867f6a1 (patch)
tree6672a47e3675e7e79fd0fbf9b491045230b24eed /board/ip04
parent68e1747f9c0506159e8ecc9a4feb58e9c65a7b39 (diff)
parent5c18a1cf3e56e0177388258696be4a17a672e9d0 (diff)
downloadu-boot-imx-5480ac32171ab0e38c48c9f585fa650c7867f6a1.zip
u-boot-imx-5480ac32171ab0e38c48c9f585fa650c7867f6a1.tar.gz
u-boot-imx-5480ac32171ab0e38c48c9f585fa650c7867f6a1.tar.bz2
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts: tools/Makefile
Diffstat (limited to 'board/ip04')
0 files changed, 0 insertions, 0 deletions