Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Mon, 1 Mar 2004 00:31:58 +0000 (19:31 -0500)
committerNathan Binkert <binkertn@umich.edu>
Mon, 1 Mar 2004 00:31:58 +0000 (19:31 -0500)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 48e5262fc37a5774b10a83e4c36a89c0ef2c8f15


Trivial merge