Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Mon, 23 Oct 2006 18:32:35 +0000 (14:32 -0400)
committerKevin Lim <ktlim@umich.edu>
Mon, 23 Oct 2006 18:32:35 +0000 (14:32 -0400)
commitce4531c0794ee57c0029bc905802a7856832d941
tree4d6c87eae2b07f350dc7aa26454e9304aec457dd
parentef8b7713ca1b6120ae4e851877f2a9ce71296219
parent4ccccfef7144d6c36acdb780395141e5d71890c1
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 161c35ade82f2471e605d948dca56cfa216693fd
src/cpu/o3/fetch_impl.hh
src/cpu/o3/lsq_unit.hh
src/cpu/o3/lsq_unit_impl.hh