Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 11 Apr 2007 15:30:09 +0000 (15:30 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 11 Apr 2007 15:30:09 +0000 (15:30 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 50102b96ba07b2b132d649a111268ee1f08c2147


Trivial merge