Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : e8933f852352164f4e50444f94cc6ee260e06766

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

diff --cc src/cpu/simple/timing.hh
Simple merge