Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Fri, 21 Oct 2005 23:18:28 +0000 (19:18 -0400)
committerNathan Binkert <binkertn@umich.edu>
Fri, 21 Oct 2005 23:18:28 +0000 (19:18 -0400)
into  ziff.eecs.umich.edu:/z/binkertn/research/m5/head

--HG--
extra : convert_revision : 35075f75f7e31e0500b964ec45db3019eea06c76


Trivial merge