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

--HG--
extra : convert_revision : 17b164847aee7e21d15d1a9d99aae43f46906c28


Trivial merge