Gabe Black fa763d2ecf 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

2006-03-14 16:08:32 -05:00

..

cpu.cc

Merge m5.eecs.umich.edu:/bk/newmem

2006-03-14 16:08:32 -05:00

cpu.hh

Merge m5.eecs.umich.edu:/bk/newmem

2006-03-14 16:08:32 -05:00