Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Thu, 22 Feb 2007 13:18:23 +0000 (13:18 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 22 Feb 2007 13:18:23 +0000 (13:18 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-sparc32

--HG--
extra : convert_revision : 70dcd9d1d669c1c619411389487b7910861550e3


Trivial merge