diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 21:20:49 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 21:20:49 +0200 |
| commit | 4b19b7448e63bab8af17abbb30acff00d8f0dc99 (patch) | |
| tree | 6ba89c10ebffb00cee92656da9a5aad8396390c0 /board/qemu-mips/qemu-mips.c | |
| parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff) | |
| parent | 5e3a388cddce1685ccd9bc1b58ddb89a191ed88f (diff) | |
| download | u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.zip u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.tar.gz u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.tar.bz2 | |
Merge remote-tracking branch 'u-boot-imx/master'
The single file conflict below is actually trivial.
Conflicts:
board/boundary/nitrogen6x/nitrogen6x.c
Diffstat (limited to 'board/qemu-mips/qemu-mips.c')
0 files changed, 0 insertions, 0 deletions