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

--HG--
extra : convert_revision : ba4d93f354749d02278b16e78b4ecd4b2311416b


Trivial merge