Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sun, 10 Apr 2011 19:24:40 +0000 (21:24 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 10 Apr 2011 19:24:40 +0000 (21:24 +0200)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge