projects / oweals / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10dc777 9f9d41b)
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history
include/configs/zynq-common.h patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc include/configs/zynq-common.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.