Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Sat, 8 Mar 2014 01:54:22 +0000 (20:54 -0500)
committerTom Rini <trini@ti.com>
Sat, 8 Mar 2014 01:54:22 +0000 (20:54 -0500)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge