Merge branch 'master' of git://www.denx.de/git/u-boot-net
authorWolfgang Denk <wd@denx.de>
Fri, 18 Apr 2008 07:40:06 +0000 (00:40 -0700)
committerWolfgang Denk <wd@denx.de>
Fri, 18 Apr 2008 07:40:06 +0000 (00:40 -0700)
1  2 
include/configs/imx31_litekit.h
include/configs/imx31_phycore.h

Simple merge
Simple merge