diff options
| author | Tim Newsome <tim@sifive.com> | 2021-06-30 14:38:39 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-06-30 14:56:44 -0700 |
| commit | 5edbbb4827ee8c12d16c9474d842154b4eaf5c38 (patch) | |
| tree | e431316144dbe75affaa4773d625759db47f2336 /git-hooks/commit-msg | |
| parent | f4950b7c5d4a3ead9b1433c4ea6f3bbf3a540f9c (diff) | |
| parent | cff0e417da58adef1ceef9a63a99412c2cc87ff3 (diff) | |
| download | riscv-openocd-5edbbb4827ee8c12d16c9474d842154b4eaf5c38.zip riscv-openocd-5edbbb4827ee8c12d16c9474d842154b4eaf5c38.tar.gz riscv-openocd-5edbbb4827ee8c12d16c9474d842154b4eaf5c38.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
src/flash/nor/nrf5.c
src/flash/nor/xcf.c
src/jtag/drivers/remote_bitbang.c
src/rtos/FreeRTOS.c
src/rtos/zephyr.c
src/target/cortex_a.c
src/target/cortex_a.h
src/target/cortex_m.c
src/target/riscv/riscv.c
Change-Id: I80b0a33b40c06c229d20fe34e04d6322da83326d
Diffstat (limited to 'git-hooks/commit-msg')
0 files changed, 0 insertions, 0 deletions