Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Mon, 6 Jan 2014 19:07:08 +0000 (14:07 -0500)
committerTom Rini <trini@ti.com>
Mon, 6 Jan 2014 19:07:08 +0000 (14:07 -0500)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge