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)
commit248b7d984cffa3107b5acb4c3f5501b7538d877a
treebcd28ebe0c05d08880f7ec14c9eb8ad99edef98c
parent7064122c2eef92f02a03ef37a1a1c07e70cd4e38
parent3e0f331c05d72f140715c1e9fca991927e44d422
Merge branch 'master' of git://denx.de/git/u-boot-net
include/configs/imx31_litekit.h
include/configs/imx31_phycore.h