Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:59:42 +0000 (21:59 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:59:42 +0000 (21:59 +0200)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge