Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Wed, 10 Nov 2004 23:37:33 +0000 (18:37 -0500)
committerNathan Binkert <binkertn@umich.edu>
Wed, 10 Nov 2004 23:37:33 +0000 (18:37 -0500)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 64eca6a11aeae236e802f9ca8eb97ca05d394ec7


Trivial merge