Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Sat, 4 Mar 2006 20:23:06 +0000 (15:23 -0500)
committerKevin Lim <ktlim@umich.edu>
Sat, 4 Mar 2006 20:23:06 +0000 (15:23 -0500)
into  zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/m5-shadowregs

--HG--
extra : convert_revision : 570b1c4331075587a866dfada7fbe51805cdcad4


Trivial merge