Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 26 Jan 2007 17:51:24 +0000 (12:51 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 26 Jan 2007 17:51:24 +0000 (12:51 -0500)
commitc215d54aac6925cf13079d8d8fe3691451a77ce1
treec0f6e61b7178a2a60f6825555305256c025e682f
parentcf7294250669e098e4ca47629afbbc6b52b6fb4c
parent202d7f62b9ea11e6b72c4b15ff818549ea14f038
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5

--HG--
extra : convert_revision : 1b854ec7caa33d3009383754206b643494c4c42d
src/arch/sparc/ua2005.cc
src/cpu/simple/base.cc