Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
authorGabe Black <gblack@eecs.umich.edu>
Thu, 9 Mar 2006 20:15:55 +0000 (15:15 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 9 Mar 2006 20:15:55 +0000 (15:15 -0500)
commit91545ac2bf5ac47ecbfc403ef6e2b2ce340ae551
treec01c598d48d60de1c4097d905430b44b9647e224
parent77e40756b723e6cf18462bbb15653792b5c90346
parente30bce8f8e4fdb3dbf4f8161f496c94c85d3d8cf
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into  zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch

cpu/simple/cpu.cc:
    Hand Merge

--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : bf664b092f993d0f4675ce8e7df13645a920c1f4
arch/alpha/isa_traits.hh
cpu/cpu_exec_context.hh
cpu/simple/cpu.cc