Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 28 Mar 2006 20:14:13 +0000 (15:14 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 28 Mar 2006 20:14:13 +0000 (15:14 -0500)
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 762df7bf15e8e22a8fab8bbcd933047d1c8cdfa9


Trivial merge