Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Fri, 20 Feb 2004 20:08:02 +0000 (15:08 -0500)
committerNathan Binkert <binkertn@umich.edu>
Fri, 20 Feb 2004 20:08:02 +0000 (15:08 -0500)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/memory

--HG--
extra : convert_revision : 691c89ebacb3c5a5eb67359ed102646b8547dd17


Trivial merge