Corrected some mistakes in the hand merge
Corrected some mistakes in the hand merge

--HG--
extra : convert_revision : 84d852e625f754c4414403e8c3e26bda80500d4f

samueldotj/TeeRISC-Simulator,rjschof/gem5,TUD-OS/gem5-dtu,joerocklin/gem5,joerocklin/gem5,samueldotj/TeeRISC-Simulator,gem5/gem5,KuroeKurose/gem5,yb-kim/gemV,rallylee/gem5,joerocklin/gem5,TUD-OS/gem5-dtu,austinharris/gem5-riscv,rallylee/gem5,HwisooSo/gemV-update,briancoutinho0905/2dsampling,markoshorro/gem5,kaiyuanl/gem5,gedare/gem5,austinharris/gem5-riscv,yb-kim/gemV,SanchayanMaity/gem5,zlfben/gem5,HwisooSo/gemV-update,gedare/gem5,rjschof/gem5,samueldotj/TeeRISC-Simulator,yb-kim/gemV,joerocklin/gem5,cancro7/gem5,aclifton/cpeg853-gem5,briancoutinho0905/2dsampling,gedare/gem5,gedare/gem5,powerjg/gem5-ci-test,rallylee/gem5,KuroeKurose/gem5,yb-kim/gemV,zlfben/gem5,kaiyuanl/gem5,HwisooSo/gemV-update,aclifton/cpeg853-gem5,SanchayanMaity/gem5,gem5/gem5,joerocklin/gem5,aclifton/cpeg853-gem5,samueldotj/TeeRISC-Simulator,TUD-OS/gem5-dtu,Weil0ng/gem5,SanchayanMaity/gem5,Weil0ng/gem5,yb-kim/gemV,kaiyuanl/gem5,sobercoder/gem5,SanchayanMaity/gem5,zlfben/gem5,markoshorro/gem5,KuroeKurose/gem5,austinharris/gem5-riscv,aclifton/cpeg853-gem5,rjschof/gem5,cancro7/gem5,HwisooSo/gemV-update,austinharris/gem5-riscv,sobercoder/gem5,zlfben/gem5,joerocklin/gem5,qizenguf/MLC-STT,samueldotj/TeeRISC-Simulator,rjschof/gem5,rjschof/gem5,sobercoder/gem5,sobercoder/gem5,qizenguf/MLC-STT,powerjg/gem5-ci-test,cancro7/gem5,kaiyuanl/gem5,qizenguf/MLC-STT,aclifton/cpeg853-gem5,markoshorro/gem5,cancro7/gem5,powerjg/gem5-ci-test,gem5/gem5,rallylee/gem5,rallylee/gem5,powerjg/gem5-ci-test,gedare/gem5,kaiyuanl/gem5,aclifton/cpeg853-gem5,austinharris/gem5-riscv,qizenguf/MLC-STT,markoshorro/gem5,powerjg/gem5-ci-test,kaiyuanl/gem5,briancoutinho0905/2dsampling,samueldotj/TeeRISC-Simulator,joerocklin/gem5,briancoutinho0905/2dsampling,zlfben/gem5,austinharris/gem5-riscv,aclifton/cpeg853-gem5,rjschof/gem5,powerjg/gem5-ci-test,KuroeKurose/gem5,qizenguf/MLC-STT,qizenguf/MLC-STT,KuroeKurose/gem5,joerocklin/gem5,gedare/gem5,cancro7/gem5,HwisooSo/gemV-update,yb-kim/gemV,Weil0ng/gem5,TUD-OS/gem5-dtu,gedare/gem5,qizenguf/MLC-STT,markoshorro/gem5,rallylee/gem5,briancoutinho0905/2dsampling,zlfben/gem5,HwisooSo/gemV-update,markoshorro/gem5,Weil0ng/gem5,sobercoder/gem5,briancoutinho0905/2dsampling,kaiyuanl/gem5,austinharris/gem5-riscv,rallylee/gem5,yb-kim/gemV,KuroeKurose/gem5,Weil0ng/gem5,gem5/gem5,Weil0ng/gem5,rjschof/gem5,SanchayanMaity/gem5,cancro7/gem5,TUD-OS/gem5-dtu,powerjg/gem5-ci-test,sobercoder/gem5,KuroeKurose/gem5,Weil0ng/gem5,gem5/gem5,TUD-OS/gem5-dtu,SanchayanMaity/gem5,cancro7/gem5,yb-kim/gemV,gem5/gem5,markoshorro/gem5,sobercoder/gem5,gem5/gem5,TUD-OS/gem5-dtu,zlfben/gem5,briancoutinho0905/2dsampling,SanchayanMaity/gem5,samueldotj/TeeRISC-Simulator,HwisooSo/gemV-update