Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 16 Jun 2006 21:53:33 +0000 (17:53 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 16 Jun 2006 21:53:33 +0000 (17:53 -0400)
commit4e07f6ca52828247fe1741b1e6c5269ad5291187
treeaf786c3cfcdd5640b5840ffdfab64bb55b9e49f9
parent51a5b826373e2c08ba173854a19597d59e0e3c90
parent0bbd909f02e72a321a65b933104c5ef1e157116b
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9
configs/test/test.py
src/SConscript
src/cpu/o3/commit.hh
src/cpu/o3/cpu.cc
src/cpu/o3/cpu.hh
src/cpu/o3/fetch.hh
src/cpu/o3/fetch_impl.hh