]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7064122 3e0f331)
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 patch | diff1 | diff2 | blob | history
include/configs/imx31_phycore.h patch | diff1 | diff2 | blob | history

diff --cc include/configs/imx31_litekit.h
Simple merge
diff --cc include/configs/imx31_phycore.h
Simple merge
Cloned from git://git.denx.de/u-boot.git