Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 24 Nov 2006 19:08:43 +0000 (14:08 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 24 Nov 2006 19:08:43 +0000 (14:08 -0500)
into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 7dbd30ce5579dd62d5f54bb5d75cf12346bc5d1d


Trivial merge