Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Thu, 10 Mar 2005 20:53:27 +0000 (15:53 -0500)
committerKevin Lim <ktlim@umich.edu>
Thu, 10 Mar 2005 20:53:27 +0000 (15:53 -0500)
commitc12a665c3120b61ed4e09da5d8a52c57406763d5
treeb5176be0d526ea24cafcd6f615058651f2b34dfb
parentaa8c9db159422a313f6dfc9a76fd827515b32126
parent51108a8c0a3a42702f49a945f8a4dac776a8d189
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : a58535776cf5a3d17f8d9f65144cdf8db54289aa
arch/alpha/isa_traits.hh
cpu/base_cpu.cc
cpu/simple_cpu/simple_cpu.cc