Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Thu, 14 Apr 2005 20:06:34 +0000 (16:06 -0400)
committerKevin Lim <ktlim@umich.edu>
Thu, 14 Apr 2005 20:06:34 +0000 (16:06 -0400)
commit26d6d97f5d46bfe2cc5734eb632bec0bc67aed19
treeed8a33f234ee4d85bc79f6179ea8907976ee3e70
parentdcedd7866e35adc1e0fbc081188b259ffc7bbdf5
parent5e67b78af7f74d7223ced5b54978ca9fa29606c5
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : 0baadd8d68bfa6f8e96307eb2d4426b0d9e0b8b4
cpu/base_cpu.cc
cpu/simple_cpu/simple_cpu.cc