Merge zizzer:/bk/sparcfs
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 8 Dec 2006 20:07:26 +0000 (15:07 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 8 Dec 2006 20:07:26 +0000 (15:07 -0500)
commit369e10d95adb45da7a791e6e8a6a4ced64892f14
treee7bd96aa8f5b8c7842805038121b3f27d03b2e24
parented22eb781dc7714c1b2ca17cf17824917e38319c
parentda6c1f5b096288f13bd4c608b40d1caa84c4de49
Merge zizzer:/bk/sparcfs
into  zed.eecs.umich.edu:/z/hsul/work/sparc/m5

src/arch/sparc/ua2005.cc:
    hand merge

--HG--
extra : convert_revision : 5157fa5d7053cb93f73241c63871eaae6f58b8a6
src/arch/sparc/miscregfile.cc
src/arch/sparc/ua2005.cc