Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Wed, 28 Nov 2012 15:30:21 +0000 (08:30 -0700)
committerTom Rini <trini@ti.com>
Wed, 28 Nov 2012 15:30:21 +0000 (08:30 -0700)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge