Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Fri, 30 Jan 2004 23:10:15 +0000 (18:10 -0500)
committerNathan Binkert <binkertn@umich.edu>
Fri, 30 Jan 2004 23:10:15 +0000 (18:10 -0500)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel

--HG--
extra : convert_revision : 9bb172c13912f69c53897ae215e077c9b8194dd9


Trivial merge