Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Tue, 29 Jul 2014 13:41:35 +0000 (09:41 -0400)
committerTom Rini <trini@ti.com>
Tue, 29 Jul 2014 13:41:35 +0000 (09:41 -0400)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge