]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79f3877 1411fb3)
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Jan 2013 13:59:37 +0000 (14:59 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Jan 2013 13:59:37 +0000 (14:59 +0100)
1  2 
include/configs/m28evk.h patch | diff1 | diff2 | blob | history
include/image.h patch | diff1 | diff2 | blob | history

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