Merge branch 'master' of /project/eecs/parlab/git/projects/riscv
authorAndrew Waterman <waterman@s141.Millennium.Berkeley.EDU>
Thu, 9 Sep 2010 22:41:59 +0000 (15:41 -0700)
committerAndrew Waterman <waterman@s141.Millennium.Berkeley.EDU>
Thu, 9 Sep 2010 22:41:59 +0000 (15:41 -0700)
commit5c88aa157be7696eac03b9fb1e36d19ccc96f5dc
treea6f9bd62f42fad9e62c304975684f4d5ebb8d556
parent64ec64876199ef94d7a8ac6eb64b68d7f9c84ee2
parenta9176ab510f8f45990a46da2d5fbe4c4fb4a217c
Merge branch 'master' of /project/eecs/parlab/git/projects/riscv

Conflicts:
sim/riscv/insns/mtpcr.h
sim/riscv/processor.cc
riscv/insns/mfpcr.h
riscv/insns/mtpcr.h
riscv/processor.cc
riscv/processor.h