Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Fri, 16 May 2014 22:30:33 +0000 (18:30 -0400)
committerTom Rini <trini@ti.com>
Fri, 16 May 2014 22:30:33 +0000 (18:30 -0400)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge