]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 953b7e6 754613f)
Merge branch 'master' of git://git.denx.de/u-boot-sh into next
authorWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 19:37:44 +0000 (21:37 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 19:37:44 +0000 (21:37 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
"Das U-Boot" Source Tree