Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sat, 16 Dec 2006 17:55:55 +0000 (12:55 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 16 Dec 2006 17:55:55 +0000 (12:55 -0500)
into  zower.eecs.umich.edu:/eecshome/m5/sparcfs

--HG--
extra : convert_revision : c8718b3df72b8c951c24742e8ce517a93bc23fe9


Trivial merge