Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 4 Apr 2007 20:50:49 +0000 (20:50 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 4 Apr 2007 20:50:49 +0000 (20:50 +0000)
commita664017c2a839279f8b8eea1076bba47d1863b88
treeac302402f02133b6fda91ced93da52aaa8a8a3e8
parent10fe8b05dbf38acff65d95a696cad95a45bf2e16
parent3d2a434e42b10ef30bbb590722e72ed104be669a
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 81269f094834f43b4e908321bfce2e031b39d2a4
src/cpu/o3/lsq_unit.hh
src/cpu/o3/lsq_unit_impl.hh