Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 6 Oct 2006 21:10:13 +0000 (17:10 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 6 Oct 2006 21:10:13 +0000 (17:10 -0400)
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 8b5536f276527adcc27e11e790262232aeb61b13


Trivial merge