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

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

--HG--
extra : convert_revision : bd6352647798275a12d52d55a129cdddd8e25423

diff --cc cpu/cpu_exec_context.cc
Simple merge

diff --cc cpu/cpu_exec_context.hh
Simple merge

diff --cc cpu/exec_context.hh
Simple merge