Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Thu, 15 Jul 2004 03:02:11 +0000 (23:02 -0400)
committerNathan Binkert <binkertn@umich.edu>
Thu, 15 Jul 2004 03:02:11 +0000 (23:02 -0400)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 87387b4f896ed945196b2090484c932c8b7e5abc


Trivial merge