Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sun, 8 Jun 2014 11:58:41 +0000 (07:58 -0400)
committerTom Rini <trini@ti.com>
Sun, 8 Jun 2014 11:58:41 +0000 (07:58 -0400)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge