summaryrefslogtreecommitdiffstats
path: root/board/freescale/mpc8568mds
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-05-20 10:05:42 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-05-20 10:05:42 +0200
commit05d134b084590684bcf4d832c0035952727b7cd9 (patch)
tree8f5d5fd811634fa621792cad7ca361251c06cd88 /board/freescale/mpc8568mds
parent6130c14605de760bdcaef36b8a0d34eac2a955f0 (diff)
parentd7782d06534fe4fa47a49fa7c106de5ba85a9687 (diff)
downloadblackbird-obmc-uboot-05d134b084590684bcf4d832c0035952727b7cd9.tar.gz
blackbird-obmc-uboot-05d134b084590684bcf4d832c0035952727b7cd9.zip
Merge remote-tracking branch 'u-boot/master'
Conflicts: boards.cfg Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit 6130c146) to match u-boot/master's own reformatting (commit 1b37fa83).
Diffstat (limited to 'board/freescale/mpc8568mds')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud