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)
into  zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs

--HG--
extra : convert_revision : 31c1bcc2c52d88bd5133a2007f9feefa2c04b6aa


Trivial merge