Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Thu, 6 Jul 2006 17:59:13 +0000 (13:59 -0400)
committerKevin Lim <ktlim@umich.edu>
Thu, 6 Jul 2006 17:59:13 +0000 (13:59 -0400)
commit05eef5ee1569f7a1c399a2b358a11323e88a48f8
tree497f1de51ddf8d65f11b92a551062934abbeac2d
parente60f998e2993df35460c8835016b3043a13da80a
parent30c516d51cad44f62a7269a59f067ae5a1be81df
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 00f8eecf99c771ae8943ed1d3a652bfbcfe1c6bc
src/cpu/o3/cpu.cc