Merge zizzer:/bk/multiarch
authorKorey Sewell <ksewell@umich.edu>
Tue, 14 Feb 2006 07:12:39 +0000 (02:12 -0500)
committerKorey Sewell <ksewell@umich.edu>
Tue, 14 Feb 2006 07:12:39 +0000 (02:12 -0500)
into  zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/m5-multiarch

--HG--
extra : convert_revision : 62d9346c44d5b7d455414fbebf0da3a8ef8d0754


Trivial merge