From: Tom Rini <trini@ti.com>
Date: Wed, 24 Jul 2013 13:30:46 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mips
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=230187ce266889ad465b39ded6717805379e7ffe;p=u-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-mips

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>
---

230187ce266889ad465b39ded6717805379e7ffe