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

--HG--
extra : convert_revision : f3502f293f6ea44b5cf209ce2a935a25bca6054f


Trivial merge