Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)
committerStefano Babic <sbabic@denx.de>
Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)
1  2 
README
boards.cfg

diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge