Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Thu, 18 Nov 2004 03:44:12 +0000 (22:44 -0500)
committerNathan Binkert <binkertn@umich.edu>
Thu, 18 Nov 2004 03:44:12 +0000 (22:44 -0500)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 46a0ce7e098bab38b0df8d86e37dd16936c6eeb7


Trivial merge