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)
commit230187ce266889ad465b39ded6717805379e7ffe
treeda91d96b28eba97d7e14ffee800fc1003dac880d
parent8dde4ca90ee12a9dd40f42b80e51107ecd26ebe0
parentdb2c86d7d71d1be0ac0fe702493faf9302639235
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>