Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Wed, 8 Nov 2006 20:07:31 +0000 (15:07 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Wed, 8 Nov 2006 20:07:31 +0000 (15:07 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : 5f4b39beba9f672ba1741cb45f4c3cf853ce574b


Trivial merge