From: Tom Rini Date: Wed, 24 Jul 2013 13:30:46 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-mips X-Git-Tag: v2013.10-rc1~65 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=230187ce266889ad465b39ded6717805379e7ffe;hp=-c 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 --- 230187ce266889ad465b39ded6717805379e7ffe