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

--HG--
extra : convert_revision : c99372d62e4e6acdced977da8480f2379b6f00a1


Trivial merge