Merge gblack@m5.eecs.umich.edu:/bk/multiarch

into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : f6db244a66431dd6b8c5ba251ed02d76cd509cff

diff --cc cpu/exec_context.cc
Simple merge

diff --cc cpu/exec_context.hh
Simple merge

diff --cc cpu/simple/cpu.cc
Simple merge