]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42d44f6 e72f467)
Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
boards.cfg patch | diff1 | diff2 | blob | history
include/configs/shmin.h patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc include/configs/shmin.h
Simple merge
Cloned from git://git.denx.de/u-boot.git