| commit | ef6bec6c9845a44b48f5b144c3d56448a74d5ca9 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Wed Jul 24 09:30:46 2013 -0400 |
| committer | Tom Rini <trini@ti.com> | Thu Jul 25 08:51:48 2013 -0400 |
| tree | da91d96b28eba97d7e14ffee800fc1003dac880d | |
| parent | 3465ea2682eebbf27230cf455033d0dc19f07d1f [diff] | |
| parent | 02d51a2dde6009e95bfd3bf838180c6b24de849f [diff] |
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>