Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 10 Apr 2007 01:53:04 +0000 (01:53 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 10 Apr 2007 01:53:04 +0000 (01:53 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 247fc298ba8ea1ea38ee2e906aa84bb5bc3f4592


Trivial merge