Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Fri, 3 Mar 2006 21:04:34 +0000 (16:04 -0500)
committerKevin Lim <ktlim@umich.edu>
Fri, 3 Mar 2006 21:04:34 +0000 (16:04 -0500)
into  zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs

--HG--
extra : convert_revision : 979ab1fc4e1ea4d6a78ac9a2ec894f0be4feb01d

1  2 
arch/alpha/isa/decoder.isa
cpu/simple/cpu.cc

Simple merge
Simple merge