Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 14 Mar 2006 21:08:32 +0000 (16:08 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 14 Mar 2006 21:08:32 +0000 (16:08 -0500)
commitfa763d2ecfae16e84a9f9d689d19f746d84d08e3
tree52474edfd8d1ab010a376b1eb66f4d9990fe4a54
parentf045b110cf1db6f9fc70589532b48d9cca339897
parentefe46430fac2419a02062e3b282324498a55df28
Merge m5.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

cpu/cpu_exec_context.cc:
    Hand merge

--HG--
rename : arch/alpha/registerfile.hh => arch/alpha/regfile.hh
extra : convert_revision : bd18966f7c37c67c2bc7ca2633b58f70ce64409c
arch/alpha/ev5.cc
arch/alpha/regfile.hh
cpu/cpu_exec_context.hh
cpu/simple/cpu.cc
cpu/simple/cpu.hh