]> 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: 69df282 57ae8a5)
Merge branch 'r-ml-master' into t-master
authorTom Rix <Tom.Rix@windriver.com>
Sat, 23 Jan 2010 13:22:23 +0000 (07:22 -0600)
committerTom Rix <Tom.Rix@windriver.com>
Sat, 23 Jan 2010 13:22:23 +0000 (07:22 -0600)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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