Merge branch 'master' of git://git.denx.de/u-boot-pxa
authorWolfgang Denk <wd@denx.de>
Thu, 15 Jul 2010 20:49:12 +0000 (22:49 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 15 Jul 2010 20:49:12 +0000 (22:49 +0200)
1  2 
MAKEALL
Makefile
boards.cfg

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge