Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Mon, 10 Jul 2006 19:41:35 +0000 (15:41 -0400)
committerKevin Lim <ktlim@umich.edu>
Mon, 10 Jul 2006 19:41:35 +0000 (15:41 -0400)
commit5dbd7a3f766dcf7bbfb29ede45655c01994b1425
treed2c8358ef670eea00b4bb9e128f6da6de68db693
parentf60d8217e3c9fd7c4ea75ab0c89dbbd63db75ffd
parent5584e2b26eccb5d2bf445b8b0b2040449d0b0a77
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 0e4c7684879b8552908e0b64a00b4824de807244
src/cpu/o3/commit_impl.hh
src/cpu/o3/cpu.cc