projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10fe8b0 3d2a434)
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)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 81269f094834f43b4e908321bfce2e031b39d2a4

1  2 
src/cpu/o3/lsq_unit.hh patch | diff1 | diff2 | blob | history
src/cpu/o3/lsq_unit_impl.hh patch | diff1 | diff2 | blob | history

diff --cc src/cpu/o3/lsq_unit.hh
Simple merge
diff --cc src/cpu/o3/lsq_unit_impl.hh
Simple merge