Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Sun, 5 Mar 2006 04:37:45 +0000 (23:37 -0500)
committerKevin Lim <ktlim@umich.edu>
Sun, 5 Mar 2006 04:37:45 +0000 (23:37 -0500)
commit5d67efd21738c938014c14cec845a89b1f97e1c3
tree5b8a66356e1d1c3ad3994e88b731c8ed005ff518
parent7ded9532d563146e1acdb21b7ba99709885b4177
parent57e051d1a559c745420e6810c8dbdb308073ef63
Merge ktlim@zizzer:/bk/m5
into  zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs

--HG--
extra : convert_revision : 31c1bcc2c52d88bd5133a2007f9feefa2c04b6aa