Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 6 Apr 2007 14:37:46 +0000 (14:37 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 6 Apr 2007 14:37:46 +0000 (14:37 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : b7e89d32df946ea24c438292308f5fc8248f8bd9


Trivial merge