Merge zizzer:/bk/multiarch
authorKorey Sewell <ksewell@umich.edu>
Wed, 8 Feb 2006 21:24:25 +0000 (16:24 -0500)
committerKorey Sewell <ksewell@umich.edu>
Wed, 8 Feb 2006 21:24:25 +0000 (16:24 -0500)
into  zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/m5-multiarch

--HG--
extra : convert_revision : 2bfc19cfa186776ff94440b01ea51f520f61234f


Trivial merge