Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Mon, 5 Mar 2007 11:00:44 +0000 (11:00 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 5 Mar 2007 11:00:44 +0000 (11:00 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : b585cea2221377eb2fceea8976c46a17c0034f51


Trivial merge