Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Thu, 10 May 2007 03:50:46 +0000 (20:50 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 10 May 2007 03:50:46 +0000 (20:50 -0700)
into  doughnut.mwconnections.com:/home/gblack/newmem-o3-micro

--HG--
extra : convert_revision : 545b9e98eb1895f4b9e782224fb6615c71ed6323

1  2 
src/arch/sparc/isa/formats/mem/swap.isa
src/cpu/o3/commit_impl.hh

Simple merge