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)
commitfc664f7ca6d4883e9efe7fb823cd903a867af7a9
tree611a86dd02addcf7c44255aa66d7e2607dab0339
parent9ad917858763bb44c8e6e22b7bb370fd50d518df
parent14b6cd39aadcac72e8fce47e24445037bae70309
Merge ktlim@zizzer:/bk/m5
into  zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs

--HG--
extra : convert_revision : 979ab1fc4e1ea4d6a78ac9a2ec894f0be4feb01d
arch/alpha/isa/decoder.isa
cpu/simple/cpu.cc