Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Sat, 12 Feb 2011 19:37:47 +0000 (20:37 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 12 Feb 2011 19:37:47 +0000 (20:37 +0100)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge