Merge zizzer:/bk/sparcfs
authorGabe Black <gblack@eecs.umich.edu>
Wed, 29 Nov 2006 22:34:20 +0000 (17:34 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 29 Nov 2006 22:34:20 +0000 (17:34 -0500)
commit5bdf4400b223056d296ae27f4a7ee2f707a4d1bd
treeff29e4424fe411d28b82ab653baa86a7f86ed18b
parentf2daf210f1cac2dd0a102b9d796fb700d4be92d1
parent544f4b4d8156c1b7f779a2dd974cbff6a5b67c20
Merge zizzer:/bk/sparcfs
into  zower.eecs.umich.edu:/eecshome/m5/newmemmid

src/arch/sparc/isa_traits.hh:
src/arch/sparc/miscregfile.hh:
    hand merge

--HG--
extra : convert_revision : 34f50dc5e6e22096cb2c08b5888f2b0fcd418f3e
src/arch/sparc/isa_traits.hh
src/arch/sparc/miscregfile.cc
src/arch/sparc/miscregfile.hh