Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Thu, 15 May 2014 08:27:32 +0000 (10:27 +0200)
committerStefano Babic <sbabic@denx.de>
Thu, 15 May 2014 08:27:32 +0000 (10:27 +0200)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge