]> 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: 8dde4ca db2c86d)
Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Wed, 24 Jul 2013 13:30:46 +0000 (09:30 -0400)
committerTom Rini <trini@ti.com>
Thu, 25 Jul 2013 12:51:48 +0000 (08:51 -0400)
Conflict over SPDX changes means that one change was effectively dropped
as it was fixing typos in a removed hunk of text.

Conflicts:
arch/mips/cpu/mips64/start.S

Signed-off-by: Tom Rini <trini@ti.com>

Trivial merge
"Das U-Boot" Source Tree