Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Sat, 23 Oct 2004 20:18:53 +0000 (16:18 -0400)
committerNathan Binkert <binkertn@umich.edu>
Sat, 23 Oct 2004 20:18:53 +0000 (16:18 -0400)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : aaf81b1c1283229de21e0ef7e9916a4464f72fa3


Trivial merge