]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97840b5 ace97d2)
Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 May 2015 08:09:06 +0000 (10:09 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 May 2015 08:09:06 +0000 (10:09 +0200)
1  2 
include/configs/zynq-common.h patch | diff1 | diff2 | blob | history

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