Merge branch 'master' of ssh://git.libre-soc.org:922/libreriscv
authorJacob Lifshay <programmerjake@gmail.com>
Wed, 16 Dec 2020 01:46:31 +0000 (17:46 -0800)
committerJacob Lifshay <programmerjake@gmail.com>
Wed, 16 Dec 2020 01:46:31 +0000 (17:46 -0800)
commit19a4a951f652cb4060658ae0f56b87e5949f588d
treee6472bc4a211443cf1bd952b6bfadceded704602
parentb5bf954e75531ce6f99dff2d646bbc60c897b0a7
parent26abcb46742932efda2bf5095817c7f2ccbd1a11
Merge branch 'master' of ssh://git.libre-soc.org:922/libreriscv

fix some conflicts
openpower/sv/svp_rewrite/svp64.mdwn