| commit | d5fd584e06dc0dffd577ca04a2a11d9378ab229e | |
| author | rodrigo_l_rosa <rodrigorosa.lg@gmail.com> | |
| Mon, 21 Nov 2011 23:31:03 +0000 (21 15:31 -0800) | ||
| committer | rodrigo_l_rosa <rodrigorosa.lg@gmail.com> | |
| Mon, 21 Nov 2011 23:31:03 +0000 (21 15:31 -0800) | ||
| tree | 90854406bc33d6ea26e2bcba2a49d4904570ba1c | treesnapshot (tar.gz zip) |
| parent | 40d827444b2f02b4bc72e43f9f0500059898c4d3 | commitdiff |
| parent | 8da52534d7d86649f68c32358adaa19fcb3d2e24 | commitdiff |
Merge branch 'dsp5680xx_cherry' into merging__dsp5680xx_cherry__into__ft2232_gpio_danger
Conflicts:
src/flash/nor/dsp5680xx_flash.c
src/jtag/drivers/ft2232.c
src/target/dsp5680xx.c
src/target/dsp5680xx.h
merging code into the master branch was pretty complicated. the new control system (jenkins+gerrit) is really uptight about spaces, syntax and bla, so a bunch of stuff was changed.
the merge does not introduce any logical changes in the code, just spacing, defs, etc. the logical changes are in the previous patches.
the master branch changes are merging in here, so the stm should be correctly supported now.
Change-Id: Iad54ae512607bbb39c3bdc0743bd479733f6df16
Conflicts:
src/flash/nor/dsp5680xx_flash.c
src/jtag/drivers/ft2232.c
src/target/dsp5680xx.c
src/target/dsp5680xx.h
merging code into the master branch was pretty complicated. the new control system (jenkins+gerrit) is really uptight about spaces, syntax and bla, so a bunch of stuff was changed.
the merge does not introduce any logical changes in the code, just spacing, defs, etc. the logical changes are in the previous patches.
the master branch changes are merging in here, so the stm should be correctly supported now.
Change-Id: Iad54ae512607bbb39c3bdc0743bd479733f6df16