Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Mon, 12 Jun 2006 04:49:24 +0000 (00:49 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 12 Jun 2006 04:49:24 +0000 (00:49 -0400)
commit15a8f050605919579e81b6abb98a0b596334216d
tree583b0b30f13d9874a69015d58d041ce2d7352960
parent60a734e1750f3c051fe92fea6f12158db6e2dcb9
parentdf4b4f001e4db902297acf3b75480e4886e4e882
Merge m5.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

src/arch/sparc/regfile.hh:
    Hand Merge

--HG--
extra : convert_revision : c47202689202069892524a7d71962082469996ee
src/arch/sparc/regfile.hh