summaryrefslogtreecommitdiff
path: root/include/common.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-07-24 09:30:46 -0400
committerTom Rini <trini@ti.com>2013-07-25 08:51:48 -0400
commit230187ce266889ad465b39ded6717805379e7ffe (patch)
treeda91d96b28eba97d7e14ffee800fc1003dac880d /include/common.h
parent8dde4ca90ee12a9dd40f42b80e51107ecd26ebe0 (diff)
parentdb2c86d7d71d1be0ac0fe702493faf9302639235 (diff)
downloadu-boot-imx-230187ce266889ad465b39ded6717805379e7ffe.zip
u-boot-imx-230187ce266889ad465b39ded6717805379e7ffe.tar.gz
u-boot-imx-230187ce266889ad465b39ded6717805379e7ffe.tar.bz2
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>
Diffstat (limited to 'include/common.h')
0 files changed, 0 insertions, 0 deletions