Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 3 Apr 2007 15:01:36 +0000 (15:01 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 3 Apr 2007 15:01:36 +0000 (15:01 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 7be8ebe55a7b11552d78701520f93aa86db1e501


Trivial merge