Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Mon, 9 Apr 2007 07:59:57 +0000 (07:59 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 9 Apr 2007 07:59:57 +0000 (07:59 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 1396ed5b264d29377ef9793a763225a93181f65f


Trivial merge