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)
commit4ad1b58fdd7cc9ba9704ae966a41c99fd0f1dbc9
tree2c68db7cd94a457fff83fe8d4bd7c63a6de023c0
parent939cbd8201a4b0dfad6a56b5d9fb68cc2b23ae73
parentc2ac0fd89b9928f653e1485b2432cd71b455d7c5
Merge zizzer.eecs.umich.edu:/bk/newmem
into  doughnut.mwconnections.com:/home/gblack/newmem-o3-micro

--HG--
extra : convert_revision : 545b9e98eb1895f4b9e782224fb6615c71ed6323
src/arch/sparc/isa/formats/mem/swap.isa
src/cpu/o3/commit_impl.hh