]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10ec0f8 14d315b)
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Mon, 4 Feb 2013 14:07:34 +0000 (09:07 -0500)
committerTom Rini <trini@ti.com>
Mon, 4 Feb 2013 14:14:22 +0000 (09:14 -0500)
1  2 
common/cmd_bdinfo.c patch | diff1 | diff2 | blob | history
drivers/block/systemace.c patch | diff1 | diff2 | blob | history

diff --cc common/cmd_bdinfo.c
Simple merge
diff --cc drivers/block/systemace.c
Simple merge
Cloned from git://git.denx.de/u-boot.git