Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 26 Oct 2010 18:57:41 +0000 (20:57 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 26 Oct 2010 18:57:41 +0000 (20:57 +0200)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge