Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 11 Oct 2010 08:19:04 +0000 (10:19 +0200)
1  2 
MAINTAINERS
boards.cfg

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge