Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa
authorWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 20:08:33 +0000 (22:08 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 20:08:33 +0000 (22:08 +0200)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge