diff options
| author | Tom Rini <trini@ti.com> | 2013-07-24 13:30:46 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-25 12:51:48 (GMT) |
| commit | 230187ce266889ad465b39ded6717805379e7ffe (patch) | |
| tree | da91d96b28eba97d7e14ffee800fc1003dac880d /include/configs/xpedite1000.h | |
| parent | 8dde4ca90ee12a9dd40f42b80e51107ecd26ebe0 (diff) | |
| parent | db2c86d7d71d1be0ac0fe702493faf9302639235 (diff) | |
| download | u-boot-230187ce266889ad465b39ded6717805379e7ffe.tar.xz | |
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/configs/xpedite1000.h')
0 files changed, 0 insertions, 0 deletions